Hi Johannes Thanks for your detailed answer. On 2018-07-04 at 15:09:34 +0200, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > On Wed, 4 Jul 2018, Tobias Klauser wrote: > > > Part of the todo help message in git-rebase--interactive.sh and > > git-rebase--preserve-merges.sh is unnecessarily indented, making the > > message look weird: > > > > # These lines can be re-ordered; they are executed from top to bottom. > > # > > # If you remove a line here THAT COMMIT WILL BE LOST. > > # > > # However, if you remove everything, the rebase will be aborted. > > # > > # > > # Note that empty commits are commented out > > > > Remove the extra lines and trailing indent to make it look as follows: > > > > # These lines can be re-ordered; they are executed from top to bottom. > > # > > # If you remove a line here THAT COMMIT WILL BE LOST. > > # > > # However, if you remove everything, the rebase will be aborted. > > # > > # Note that empty commits are commented out > > > > Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx> > > Thank you for this contribution! > > Funnily enough, the same fix had been provided here: > https://public-inbox.org/git/614F0C12-7173-48BD-9212-71AD6FBBDAA7@xxxxxxx/ > although only for `git-rebase--interactive.sh`. > > In that thread, we agreed that it overlaps too much with a GSoC project, > and that that project already addresses the same problem by way of > rewriting that part in C (and therefore we decided it would be better to > go with those patches). Unfortunately I don't follow git development that closely anymore, so I wasn't aware of the previous patch and the discussion. Sorry about the duplication/conflict. And I'm glad to see that this part will be rewritten in C :-) > However, your patch also covers this: > > > git-rebase--preserve-merges.sh | 4 ++-- > > I completely missed that in the earlier patch. > > Junio, this gets an ACK from me, could you apply the > `git-rebase--preserve-merges.sh` part selectively, please? Let me know if I should provide an updated patch just for git-rebase--preserve-merges.sh Thanks Tobias
