diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:33:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:33:54 -0800 |
| commit | 8b49408421bba8a928c207991bc197a226b65782 (patch) | |
| tree | 8f244b7ca0f0cae55ab8f7b77ea2535e4b0d2d8f /git-rebase--interactive.sh | |
| parent | ac0a57c0bd156738f760e2667991e66731b86b42 (diff) | |
| parent | ed5144d7eb63a0e0e71d3b281e69e953abbf0365 (diff) | |
| download | git-8b49408421bba8a928c207991bc197a226b65782.tar.gz | |
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
"git rebase -p" mangled log messages of a merge commit, which is
now fixed.
* js/fix-merge-arg-quoting-in-rebase-p:
rebase -p: fix incorrect commit message when calling `git merge`.
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 81c5b42875..637bb3ecd5 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -396,7 +396,7 @@ pick_one_preserving_merges () { --sq-quote "$gpg_sign_opt")} \ $allow_rerere_autoupdate "$merge_args" \ "$strategy_args" \ - -m $(git rev-parse --sq-quote "$msg_content") \ + -m "$(git rev-parse --sq-quote "$msg_content")" \ "$new_parents" then printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG |