Merge branch 'jn/hooks-pre-rebase-sample-fix' into maint

Code clean-up, that makes us in sync with Debian by one patch.

* jn/hooks-pre-rebase-sample-fix:
  pre-rebase hook: capture documentation in a <<here document
This commit is contained in:
Junio C Hamano 2017-07-31 13:51:05 -07:00
commit 309ff914d5

View file

@ -88,9 +88,7 @@ else
exit 1
fi
exit 0
################################################################
<<\DOC_END
This sample hook safeguards topic branches that have been
published from being rewound.
@ -167,3 +165,5 @@ To compute (2):
git rev-list master..topic
if this is empty, it is fully merged to "master".
DOC_END