Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

From: Denton Liu <liu.denton@gmail.com>
Date: Apr 18, 2019, 00:19 UTC
Message-ID: <20190418001920.GA31901@dev-l>
In-Reply-To: <xmqqef62ozny.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Tue, Apr 16, 2019 at 10:19:45PM +0900, Junio C Hamano wrote:

Show 15 quoted lines

> * dl/rebase-i-keep-base (2019-04-16) 6 commits
>  - rebase: teach rebase --keep-base
>  - rebase: fast-forward --fork-point in more cases
>  - rebase: fast-forward --onto in more cases
>  - t3432: test rebase fast-forward behavior
>  - t3431: add rebase --fork-point tests
>  + tests (rebase): spell out the `--keep-empty` option
>  (this branch is tangled with js/spell-out-options-in-tests.)
> 
>  "git rebase --keep-base <upstream>" tries to find the original base
>  of the topic being rebased and rebase on top of that same base, which
>  is useful when running the "git rebase -i" (and its limited variant
>  "git rebase -x").
> 
>  Will merge to 'next'.

Since this patchset has grown in scope, could we update the description to mention that rebase now fast-forwards in more cases? I think this would be useful information for users to know when we write the release notes.

Thanks,

Denton