Hi Johannes, On Tue, 2017-04-25 at 23:23 +0200, Johannes Schindelin wrote: > Hi Andreas, > > On Tue, 25 Apr 2017, Andreas Schwab wrote: > > > On Apr 25 2017, Liam Beguin <liambeguin@xxxxxxxxx> wrote: > > > > > diff --git a/Documentation/config.txt b/Documentation/config.txt > > > index 475e874d5155..8b1877f2df91 100644 > > > --- a/Documentation/config.txt > > > +++ b/Documentation/config.txt > > > @@ -2614,6 +2614,25 @@ rebase.instructionFormat:: > > > the instruction list during an interactive rebase. The format will automatically > > > have the long commit hash prepended to the format. > > > > > > +rebase.abbrevCmd:: > > > + If set to true, `git rebase -i` will abbreviate the command-names in the > > > + instruction list. This means that instead of looking like this, > > > + > > > +------------------------------------------- > > > + pick deadbee The oneline of this commit > > > + pick fa1afe1 The oneline of the next commit > > > + ... > > > +------------------------------------------- > > > + > > > + the list would use the short version of the command resulting in > > > + something like this. > > > + > > > +------------------------------------------- > > > + p deadbee The oneline of this commit > > > + p fa1afe1 The oneline of the next commit > > > + ... > > > +------------------------------------------- > > > > That doesn't explain the point of the option. > > And what you forgot to say in order to make this a constructive criticism > is: we probably want to add a sentence like this: > > > Using the one-letter abbreviations will align the lines better > in case that the non-abbreviated commands have different lengths. > > Speaking of commands with different lengths, I just thought of fixup and > squash. I do not think those are handled by the patch, but they should be > (the `action` in the first loop of `rearrange_squash` should abbreviate > via `test p != "$pickcmd" || action=${action%${action#?}}`). > I just noticed this today, I'll make changes to handle this case. > Ciao, > Johannes Thanks, Liam