Richard Hartmann <richih.mailingl...@gmail.com> writes: > The other hooks use two whitespace for indentation instead of tabs > to signify code in the example/echo output. > Follow the same layout in templates/hooks--pre-rebase.sample > > Signed-off-by: Richard Hartmann <richih.mailingl...@gmail.com> > --- > templates/hooks--pre-rebase.sample | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/templates/hooks--pre-rebase.sample > b/templates/hooks--pre-rebase.sample > index b74cd1d..43426e0 100755 > --- a/templates/hooks--pre-rebase.sample > +++ b/templates/hooks--pre-rebase.sample > @@ -157,13 +157,13 @@ B to be deleted. > > To compute (1): > > - git rev-list ^master ^topic next > - git rev-list ^master next > + git rev-list ^master ^topic next > + git rev-list ^master next > > - if these match, topic has not merged in next at all. > + if these match, topic has not merged in next at all. > > To compute (2): > > - git rev-list master..topic > + git rev-list master..topic > > - if this is empty, it is fully merged to "master". > + if this is empty, it is fully merged to "master".
I think offsetting the actual commands to the right is correct, but "if these match" and "if this is empty" should be flushed to left as this patch shows. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html