diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:50:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:50:00 -0700 |
| commit | 9fdc1cc872308869d76665be55367eef48f05ff6 (patch) | |
| tree | c8d6a72151878f81e001775dbd383584f059b4ce /git-rebase--interactive.sh | |
| parent | 76f4f74a444cdb3d43950c099da60e5d1ad36305 (diff) | |
| parent | c192f9c865dbdae48c0400d717581d34cd315fb8 (diff) | |
| download | git-9fdc1cc872308869d76665be55367eef48f05ff6.tar.gz | |
Merge branch 'aw/maint-rebase-i-p-no-ff'
* aw/maint-rebase-i-p-no-ff:
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
Conflicts:
git-rebase--interactive.sh
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 6566d319aa..41ba96aeb7 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -270,7 +270,7 @@ pick_one_preserving_merges () { # No point in merging the first parent, that's HEAD new_parents=${new_parents# $first_parent} if ! do_with_author output \ - git merge ${strategy:+-s $strategy} -m \ + git merge --no-ff ${strategy:+-s $strategy} -m \ "$msg_content" $new_parents then printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG |