Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jn/hooks-pre-rebase-sample-fix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 31 Jul 2017 20:51:05 +0000
(13:51 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 31 Jul 2017 20:51:05 +0000
(13:51 -0700)
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
templates/hooks--pre-rebase.sample
patch
|
blob
|
history
raw
(from parent 1:
4f77f61
)
diff --git
a/templates/hooks--pre-rebase.sample
b/templates/hooks--pre-rebase.sample
index 053f1111c0d734c057e895cdc992188104cc4f84..b7f81c198e22e4ce578a6148fa3346becabbfb3b 100755
(executable)
--- 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