Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Reallow git-rebase --interactive --continue if commit is unnecessary
[gitweb.git]
/
git-merge-stupid.sh
diff --git
a/git-merge-stupid.sh
b/git-merge-stupid.sh
index 4b1e595363cdcfae9d9c567d98127ee83bcc2b23..f612d4729c9ae0ccdebd6b9671da3b5f89bb65f0 100755
(executable)
--- a/
git-merge-stupid.sh
+++ b/
git-merge-stupid.sh
@@
-24,7
+24,7
@@
do
esac
done
-# Give up if we are given
more than two
remotes -- not handling octopus.
+# Give up if we are given
two or more
remotes -- not handling octopus.
case "$remotes" in
?*' '?*)
exit 2 ;;