diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:45:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:45:21 -0700 |
| commit | e31b0183729cab2d6a8e2c76f009017355dacf06 (patch) | |
| tree | f76385fbc62c0bd508891c681594537f378fcf50 /git-rebase--interactive.sh | |
| parent | Merge branch 'js/blame-parsename' into maint (diff) | |
| parent | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff (diff) | |
| download | tgif-e31b0183729cab2d6a8e2c76f009017355dacf06.tar.xz | |
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
* aw/maint-rebase-i-p-no-ff:
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | 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 5873ba4bc3..c308529a9f 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -339,7 +339,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 -m "$msg" $new_parents + git merge --no-ff $STRATEGY -m "$msg" $new_parents then printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG die_with_patch $sha1 "Error redoing merge $sha1" |