summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Björn Steinbrink <B.Steinbrink@gmx.de>2007-10-31 03:20:30 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-10-30 21:27:15 -0700
commit3524b282dabd254fc50b186e35ea5c6f612aeb46 (patch)
treebd9328753e12b118f66b82eb77d0b6d283731b77
parentMake merge-recursive honor diff.renamelimit (diff)
downloadtgif-3524b282dabd254fc50b186e35ea5c6f612aeb46.tar.xz
Fix --strategy parsing in git-rebase--interactive.sh
For the --strategy/-s option, git-rebase--interactive.sh dropped the parameter which it was trying to parse. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-rebase--interactive.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 50b79ff8ff..ebc67e515d 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -357,7 +357,6 @@ do
output git reset --hard && do_rest
;;
-s|--strategy)
- shift
case "$#,$1" in
*,*=*)
STRATEGY="-s `expr "z$1" : 'z-[^=]*=\(.*\)'`" ;;