Hi Peff, Thanks for taking the time to test this, I'll squash that patch in v2.
On 27/11/17 06:11 PM, Jeff King wrote: > On Tue, Nov 28, 2017 at 12:04:45AM +0100, Johannes Schindelin wrote: > >>> +rebase.abbreviateCommands:: >>> + If set to true, `git rebase` will use abbreviated command names in the >>> + todo list resulting in something like this: >>> + >>> +------------------------------------------- >>> + p deadbee The oneline of the commit >>> + p fa1afe1 The oneline of the next commit >>> + ... >>> +------------------------------------------- >> >> I *think* that AsciiDoc will render this in a different way from what we >> want, but I am not an AsciiDoc expert. In my hands, I always had to add a >> single + in an otherwise empty line to start a new indented paragraph *and >> then continue with non-indented lines*. > > Good catch. Interestingly enough, my asciidoc seems to render this > as desired for the docbook/roff version, but has screwed-up indentation > for the HTML version. > > Fixing it as you suggest makes it look good in both (and I think you can > never go wrong with "+"-continuation, aside from making the source a bit > uglier). > > Squashable patch below for convenience, since I did try it. > > -Peff > > diff --git a/Documentation/rebase-config.txt b/Documentation/rebase-config.txt > index 0820b60f6e..42e1ba7575 100644 > --- a/Documentation/rebase-config.txt > +++ b/Documentation/rebase-config.txt > @@ -34,18 +34,19 @@ rebase.instructionFormat:: > rebase.abbreviateCommands:: > If set to true, `git rebase` will use abbreviated command names in the > todo list resulting in something like this: > - > ++ > ------------------------------------------- > p deadbee The oneline of the commit > p fa1afe1 The oneline of the next commit > ... > ------------------------------------------- > - > - instead of: > - > ++ > +instead of: > ++ > ------------------------------------------- > pick deadbee The oneline of the commit > pick fa1afe1 The oneline of the next commit > ... > ------------------------------------------- > - Defaults to false. > ++ > +Defaults to false. > Liam
