diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-07-18 12:48:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-18 12:48:10 -0700 |
| commit | 11157492230874c0c2f36481e75f08406c4ed6e7 (patch) | |
| tree | 28a9edc957951b6005cc9b8b9f0f2655c020c339 | |
| parent | Merge branch 'rs/progress-overall-throughput-at-the-end' (diff) | |
| parent | pre-rebase hook: capture documentation in a <<here document (diff) | |
| download | tgif-11157492230874c0c2f36481e75f08406c4ed6e7.tar.xz | |
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
| -rwxr-xr-x | templates/hooks--pre-rebase.sample | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/hooks--pre-rebase.sample b/templates/hooks--pre-rebase.sample index 053f1111c0..b7f81c198e 100755 --- a/templates/hooks--pre-rebase.sample +++ b/templates/hooks--pre-rebase.sample @@ -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 |