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

[PATCH 3/3] git-rebase--interactive.sh: Make 3-way merge strategies work for -p.

!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 3/3] git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
Date: Tuesday, October 30, 2007 - 10:20 pm

git-rebase--interactive.sh used to pass all parents of a merge commit to
git-merge, which means that we have at least 3 heads to merge: HEAD,
first parent and second parent. So 3-way merge strategies like recursive
wouldn't work.

Fortunately, we have checked out the first parent right before the merge
anyway, so that is HEAD. Therefore we can drop simply it from the list
of parents, making 3-way strategies work for merge commits with only
two parents.

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)