mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
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örn Steinbrink <B.Steinbrink@gmx.de> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2a9c53e03d
commit
f91333d646
|
@ -165,6 +165,8 @@ pick_one_preserving_merges () {
|
|||
eval "$author_script"
|
||||
msg="$(git cat-file commit $sha1 | \
|
||||
sed -e '1,/^$/d' -e "s/[\"\\]/\\\\&/g")"
|
||||
# No point in merging the first parent, that's HEAD
|
||||
new_parents=${new_parents# $first_parent}
|
||||
# NEEDSWORK: give rerere a chance
|
||||
if ! output git merge $STRATEGY -m "$msg" $new_parents
|
||||
then
|
||||
|
|
Loading…
Reference in a new issue