diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-31 13:51:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-31 13:51:05 -0700 |
| commit | 309ff914d5ae1cdc95c826f7ac45b859e1d43d67 (patch) | |
| tree | 3aeff343a34553c57ea23252314fc85241a7cc50 | |
| parent | 4f77f618d99174559f3c99439d9448e916ee45cf (diff) | |
| parent | 8db1ae57409b10ba48596198b329adba7fcb6b1a (diff) | |
| download | git-309ff914d5ae1cdc95c826f7ac45b859e1d43d67.tar.gz | |
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
| -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 |