Hi Stefan, Le 22/05/2018 à 20:26, Stefan Beller a écrit : > On Tue, May 22, 2018 at 6:31 AM, Alban Gruin <alban.gruin@xxxxxxxxx> wrote: >> This duplicates git-rebase--interactive.sh to >> git-rebase--preserve-merges.sh. This is done to split -p from -i. No >> modifications are made to this file here, but any code that is not used by -p >> will be stripped in the next commit. >> >> Signed-off-by: Alban Gruin <alban.gruin@xxxxxxxxx> > > So how would I best review this? > > I applied the patches locally[1], and ran git-ls-tree on this commit > hoping to find the same blob id for git-rebase--interactive.sh as for > git-rebase--preserve-merges.sh; however I did not. > > So I diffed them and had the diff below[2], which looks like that has parts > of Johannes recent series? > Thanks for the heads-up. I started to work on that patch set on the master branch of git.git, and I forgot to update git-rebase--preserve-merges.sh after rebasing on Johannes’ branch. So I’ll reroll the patch as soon as possible. > Thanks, > Stefan >
