diff options
| author |  Björn Steinbrink <B.Steinbrink@gmx.de> | 2007-10-31 03:20:31 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-10-30 21:28:44 -0700 |
| commit | 2a9c53e03d8293577b5163910f178075725b39dd (patch) | |
| tree | e7a9913adcdf0c7e76dbeceb7d3b9aab2dd1f1bc /sha1_file.c | |
| parent | Fix --strategy parsing in git-rebase--interactive.sh (diff) | |
| download | tgif-2a9c53e03d8293577b5163910f178075725b39dd.tar.xz | |
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>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions