diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2017-07-10 16:35:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-11 08:56:33 -0700 |
| commit | 8db1ae57409b10ba48596198b329adba7fcb6b1a (patch) | |
| tree | 382be641f12cbd11ce20b1650d4827a7a30b8e6f /templates/hooks--pre-rebase.sample | |
| parent | 95d67879735cfecfdd85f89e59d993c5b4de8835 (diff) | |
| download | git-8db1ae57409b10ba48596198b329adba7fcb6b1a.tar.gz | |
pre-rebase hook: capture documentation in a <<here documentjn/hooks-pre-rebase-sample-fix
Without this change, the sample hook does not pass a syntax check
(sh -n):
$ sh -n hooks--pre-rebase.sample
hooks--pre-rebase.sample: line 101: syntax error near unexpected token `('
hooks--pre-rebase.sample: line 101: ` merged into it again (either directly or indirectly).'
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'templates/hooks--pre-rebase.sample')
| -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 |