Home » Mailing list archives » git » 2007 » October » 31

[PATCH 2/3] git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Björn Steinbrink <B.Steinbrink@...>
To: <Johannes.Schindelin@...>
Cc: <git@...>, Björn Steinbrink <B.Steinbrink@...>
Subject: [PATCH 2/3] git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
Date: Tuesday, October 30, 2007 - 10:20 pm

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
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 1/3] Fix --strategy parsing in git-rebase--interactiv..., Björn Steinbrink, (Tue Oct 30, 10:20 pm)
[PATCH 2/3] git-rebase--interactive.sh: Don't pass a strateg..., Björn Steinbrink, (Tue Oct 30, 10:20 pm)
[PATCH 3/3] git-rebase--interactive.sh: Make 3-way merge str..., Björn Steinbrink, (Tue Oct 30, 10:20 pm)
Re: [PATCH 3/3] git-rebase--interactive.sh: Make 3-way merge..., Johannes Schindelin, (Tue Oct 30, 10:42 pm)
Re: [PATCH 3/3] git-rebase--interactive.sh: Make 3-way merge..., Björn, (Tue Oct 30, 10:53 pm)