undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.

Browse Source 
git-cherry-pick doesn't support a strategy paramter, so don't pass one.
This means that --strategy for interactive rebases is a no-op for
anything but merge commits, but that's still better than being broken. A
correct fix would probably need to port the --merge behaviour from plain
git-rebase.sh, but I have no clue how to integrate that cleanly.

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>
This commit is contained in:
Björn Steinbrink 2007-10-31 03:20:31 +01:00 committed by Junio C Hamano
parent 3524b282da
commit 2a9c53e03d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--interactive.sh
View File

@ -109,7 +109,7 @@ pick_one () {
sha1=$(git rev-parse --short $sha1) sha1=$(git rev-parse --short $sha1)
output warn Fast forward to $sha1 output warn Fast forward to $sha1
else else
output git cherry-pick $STRATEGY "$@" output git cherry-pick "$@"
fi fi
} }
@ -173,7 +173,7 @@ pick_one_preserving_merges () {
fi fi
;; ;;
*) *)
output git cherry-pick $STRATEGY "$@" || output git cherry-pick "$@" ||
die_with_patch $sha1 "Could not pick $sha1" die_with_patch $sha1 "Could not pick $sha1"
esac esac
esac esac