| commit | 2a9c53e03d8293577b5163910f178075725b39dd | |
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | |
| Wed, 31 Oct 2007 02:20:31 +0000 (31 03:20 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 31 Oct 2007 04:28:44 +0000 (30 21:28 -0700) | ||
| tree | e7a9913adcdf0c7e76dbeceb7d3b9aab2dd1f1bc | treesnapshot (tar.gz zip) |
| parent | 3524b282dabd254fc50b186e35ea5c6f612aeb46 | commitdiff |
git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
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>
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>
| git-rebase--interactive.sh | diffblobblamehistory |