Hi Tobias, 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 <tklau...@distanz.ch> Thank you for this contribution! Funnily enough, the same fix had been provided here: https://public-inbox.org/git/614f0c12-7173-48bd-9212-71ad6fbbd...@dana.is/ 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). 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? Ciao, Johannes
