Skip to content

Commit 309ff91

Browse files
committed
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
2 parents 4f77f61 + 8db1ae5 commit 309ff91

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

templates/hooks--pre-rebase.sample

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ else
8888
exit 1
8989
fi
9090

91-
exit 0
92-
93-
################################################################
91+
<<\DOC_END
9492
9593
This sample hook safeguards topic branches that have been
9694
published from being rewound.
@@ -167,3 +165,5 @@ To compute (2):
167165
git rev-list master..topic
168166
169167
if this is empty, it is fully merged to "master".
168+
169+
DOC_END

0 commit comments

Comments
 (0)