diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-21 01:20:56 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-21 01:22:41 +0400 |
| commit | 0074d18dc0d816f9842d3e0e1cd0b26341715b37 (patch) | |
| tree | af52ae3077c10d8d6940b10af46bf47a25cdf6e6 /Documentation/git-merge.txt | |
| parent | 96b8d93a539f3a9f43f0fc38214db8753cac3c2e (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>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions