pw/rebase-keep-base-fixes, was Re: What's cooking in git.git (Aug 2022, #07; Fri, 19)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 22, 2022, 11:06 UTC
Message-ID: <s69q8sro-np77-n758-2or9-050qnoo2303s@tzk.qr>
In-Reply-To: <xmqqbksfirfm.fsf@gitster.g>

Hi Junio,

On Fri, 19 Aug 2022, Junio C Hamano wrote:

Show 16 quoted lines

> * pw/rebase-keep-base-fixes (2022-08-18) 5 commits
>  - rebase --keep-base: imply --no-fork-point
>  - rebase --keep-base: imply --reapply-cherry-picks
>  - rebase: factor out merge_base calculation
>  - rebase: store orig_head as a commit
>  - t3416: set $EDITOR in subshell
>
>  "git rebase --keep-base" used to discard the commits that are
>  already cherry-picked to the upstream, even when "keep-base" meant
>  that the base, on top of which the history is being rebuilt, does
>  not yet include these cherry-picked commits.  The --keep-base
>  option now implies --reapply-cherry-picks and --no-fork-point
>  options.
>
>  Needs review.
>  source: <pull.1323.git.1660576283.gitgitgadget@gmail.com>

Please change the verdict "Needs review" (which is stale because there has been quite some review by you and me alike) to "Expecting new iteration, source: <c5b01472-7da9-6051-b127-1a8b8ddd2944@gmail.com>" (you can use that "re-roll" term, if you insist, even if nobody outside the Git mailing list uses it ;-) ).

Ciao, Dscho