From: Richard Hartmann Date: Mon, 10 Jun 2013 18:36:05 GMT Subject: [PATCH 6/6] template: Fix comment indentation in pre-rebase hook Message-ID: <1370889365-6239-7-git-send-email-richih.mailinglist@gmail.com> In-Reply-To: <1370889365-6239-1-git-send-email-richih.mailinglist@gmail.com> 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 --- 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". -- 1.7.10.4