Re: [PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message

2018-07-06 Thread Junio C Hamano
Tobias Klauser writes: > 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 >>

Re: [PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message

2018-07-04 Thread Johannes Schindelin
Hi Tobias, On Wed, 4 Jul 2018, Tobias Klauser wrote: > On 2018-07-04 at 15:09:34 +0200, Johannes Schindelin > wrote: > > > 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

Re: [PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message

2018-07-04 Thread Tobias Klauser
Hi Johannes Thanks for your detailed answer. On 2018-07-04 at 15:09:34 +0200, Johannes Schindelin 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 >

Re: [PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message

2018-07-04 Thread Johannes Schindelin
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. > #

[PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message

2018-07-04 Thread Tobias Klauser
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. # #