Re: [PATCH v4 00/12] builtin/rerere: convert to use subcommands
On 13/11/2026 18:09, Junio C Hamano wrote:
Show 13 quoted lines
> > $ git checkout ps/rerere-subcommands
> $ edit rerere.h
> $ git log --oneline --first-parent master..
> $ git commit -a --fixup HEAD~10
> $ git rebase --autosquash HEAD~11
> > By the way, I wonder if we can simplify the last three steps in any
> way?
> > * We can use 'HEAD^{/^rerere: convert flags}' instead of counting.
> > * The last "rebase" does not have to be on HEAD~11; as long as it
> covers HEAD~10 it is OK, but we cannot use 'master' as I am *not*
> interested in taking any new development from there, and I do not
> want to worry about what the command would do on the merges the
> topic has as synthetic base.So long as you've set an upstream branch, you can use "--keep-base" and omit the upstream commit.
Thanks
Phillip