mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jn/hooks-pre-rebase-sample-fix'
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:
commit
1115749223
|
@ -88,9 +88,7 @@ else
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exit 0
|
<<\DOC_END
|
||||||
|
|
||||||
################################################################
|
|
||||||
|
|
||||||
This sample hook safeguards topic branches that have been
|
This sample hook safeguards topic branches that have been
|
||||||
published from being rewound.
|
published from being rewound.
|
||||||
|
@ -167,3 +165,5 @@ 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".
|
||||||
|
|
||||||
|
DOC_END
|
||||||
|
|
Loading…
Reference in a new issue