Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
make: Remove -pthread on Darwin (it is included by cstdlib).
[gitweb.git]
/
git-rebase--interactive.sh
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index 21ac20c3056062892f938297f44c7e82145e2b61..002929eb091fe3724ba2f37277a61364f1c90db1 100755
(executable)
--- a/
git-rebase--interactive.sh
+++ b/
git-rebase--interactive.sh
@@
-571,7
+571,8
@@
first and then run 'git rebase --continue' again."
;;
--)
shift
- test ! -z "$REBASE_ROOT" -o $# -eq 1 -o $# -eq 2 || usage
+ test -z "$REBASE_ROOT" -a $# -ge 1 -a $# -le 2 ||
+ test ! -z "$REBASE_ROOT" -a $# -le 1 || usage
test -d "$DOTEST" &&
die "Interactive rebase already started"