Merge branch 'an/ignore-doc-update'

diff --git a/sequencer.c b/sequencer.c
index 334de145421c1fe1b23dd4713f1f2acedd2f78d8..ab74b6baf1185936fba414f7fb1303ba82d76284 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -3401,6 +3401,10 @@ static int do_merge(struct repository *r,
                rollback_lock_file(&lock);
                ret = fast_forward_to(r, &commit->object.oid,
                                      &head_commit->object.oid, 0, opts);
+               if (flags & TODO_EDIT_MERGE_MSG) {
+                       run_commit_flags |= AMEND_MSG;
+                       goto fast_forward_edit;
+               }
                goto leave_merge;
        }
 
@@ -3504,6 +3508,7 @@ static int do_merge(struct repository *r,
                 * value (a negative one would indicate that the `merge`
                 * command needs to be rescheduled).
                 */
+       fast_forward_edit:
                ret = !!run_git_commit(r, git_path_merge_msg(r), opts,
                                       run_commit_flags);