From: Junio C Hamano Date: Fri, 13 Nov 2026 18:09:15 GMT Subject: Re: [PATCH v4 00/12] builtin/rerere: convert to use subcommands Message-ID: In-Reply-To: Patrick Steinhardt writes: >> > @@ rerere.h: struct rerere_id { >> > + RERERE_AUTOUPDATE = (1 << 0), >> > + >> > + /* >> > -+ * Reverse of RERERE_AUTOUPDATE. That is, update the file in the >> > -+ * working tree but don't touch the index. >> > ++ * update the file in the working tree but don't touch the index. This >> >> Nit: s/update/Update > > Oops, good catch. I'll refrain from sending out another version just to > fix this one fix though. Junio, I'd appreciate it if you could fix this > up in your tree. Thanks! $ 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. Perhaps with newer experimental commands it becomes easier to manage?