From: Björn Steinbrink <B.Steinbrink@gmx.de>
Date: Wed, 31 Oct 2007 02:20:31 +0000 (+0100)
Subject: git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
X-Git-Tag: v1.5.3.5~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2a9c53e03d8293577b5163910f178075725b39dd?hp=2a9c53e03d8293577b5163910f178075725b39dd

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>
---