diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 7e8a1cf4e..fa41ec8c8 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1493,8 +1493,12 @@ int cmd_commit(int argc, const char **argv, const char *prefix) exit(1); } - if (amend) + if (amend) { extra = read_commit_extra_headers(current_head); + } else { + struct commit_extra_header **tail = &extra; + append_merge_tag_headers(parents, &tail); + } if (commit_tree_extended(sb.buf, active_cache_tree->sha1, parents, sha1, author_ident.buf, sign_commit, extra)) { |