Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/cocci-de-paren-call-params'
[gitweb.git]
/
templates
/
hooks--pre-rebase.sample
diff --git
a/templates/hooks--pre-rebase.sample
b/templates/hooks--pre-rebase.sample
index b7f81c198e22e4ce578a6148fa3346becabbfb3b..db5feab8a1ee6433108ade9e165956678a3e260b 100755
(executable)
--- a/
templates/hooks--pre-rebase.sample
+++ b/
templates/hooks--pre-rebase.sample
@@
-58,7
+58,7
@@
then
not_in_topic=`git rev-list "^$topic" master`
if test -z "$not_in_topic"
then
- echo >&2 "$topic is already up
-to-
date with master"
+ echo >&2 "$topic is already up
to
date with master"
exit 1 ;# we could allow it, but there is no point.
else
exit 0