]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/commit.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 96b8d93) | patch
commit: do not lose mergetag header when not amending
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:20:56 +0000 (13:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:22:41 +0000 (13:22 -0800)
commit0074d18dc0d816f9842d3e0e1cd0b26341715b37
treeaf52ae3077c10d8d6940b10af46bf47a25cdf6e6tree | snapshot
parent96b8d93a539f3a9f43f0fc38214db8753cac3c2ecommit | diff
commit: do not lose mergetag header when not amending

The earlier ed7a42a (commit: teach --amend to carry forward extra headers,
2011-11-08) broke "git merge/pull; edit to fix conflict; git commit"
workflow by forgetting that commit_tree_extended() takes the whole extra
header list.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/commit.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.