All of lore.kernel.org
 help / color / mirror / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Oct 2019, #01; Thu, 3)
Date: Fri, 4 Oct 2019 10:44:47 +0100	[thread overview]
Message-ID: <972f4674-ed00-7113-24eb-f59f1b751690@gmail.com> (raw)
In-Reply-To: <xmqqsgoabes8.fsf@gitster-ct.c.googlers.com>

Hi Junio

On 03/10/2019 06:04, Junio C Hamano wrote:
> Here are the topics that have been cooking.  Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.  The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
> [...]
> 
> 
> * pw/rebase-i-show-HEAD-to-reword (2019-08-19) 3 commits
>   - sequencer: simplify root commit creation
>   - rebase -i: check for updated todo after squash and reword
>   - rebase -i: always update HEAD before rewording
>   (this branch is used by ra/rebase-i-more-options.)
> 
>   "git rebase -i" showed a wrong HEAD while "reword" open the editor.
> 
>   Will merge to 'next'.

That's great, thanks

> 
> * ra/rebase-i-more-options (2019-09-09) 6 commits
>   - rebase: add --reset-author-date
>   - rebase -i: support --ignore-date
>   - sequencer: rename amend_author to author_to_rename
>   - rebase -i: support --committer-date-is-author-date
>   - sequencer: allow callers of read_author_script() to ignore fields
>   - rebase -i: add --ignore-whitespace flag
>   (this branch uses pw/rebase-i-show-HEAD-to-reword.)
> 
>   "git rebase -i" learned a few options that are known by "git
>   rebase" proper.
> 
>   Is this ready for 'next'.

Nearly, but not quite I think cf [1]. Also I'm still not convinced that 
having different behaviors for --ignore-whitespace depending on the 
backend is going to be helpful but maybe they are close enough not to 
matter too much in practice [2].

[1] 
https://public-inbox.org/git/20190806173638.17510-1-rohit.ashiwal265@gmail.com/T/#m965ce1f09d1d1b8010c04db0eabd4b19ce99fe82

[2] 
https://public-inbox.org/git/20190806173638.17510-1-rohit.ashiwal265@gmail.com/T/#m94e059c18b7bbcc721d12b190bd4aaecc5e8d591

  parent reply	other threads:[~2019-10-04  9:44 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-03  5:04 What's cooking in git.git (Oct 2019, #01; Thu, 3) Junio C Hamano
2019-10-03 18:28 ` Emily Shaffer
2019-10-03 22:31   ` Junio C Hamano
2019-10-03 20:28 ` Elijah Newren
2019-10-03 22:31   ` Junio C Hamano
2019-10-04  9:44 ` Phillip Wood [this message]
2019-10-05  0:40   ` Elijah Newren
2019-10-05 19:46     ` Phillip Wood
2019-10-05 23:36   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=972f4674-ed00-7113-24eb-f59f1b751690@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood@dunelm.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.