diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-20 13:20:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-20 13:22:41 -0800 |
| commit | 0074d18dc0d816f9842d3e0e1cd0b26341715b37 (patch) | |
| tree | af52ae3077c10d8d6940b10af46bf47a25cdf6e6 /t/t5515/refs.br-branches-one-octopus_branches-one | |
| parent | commit-tree: teach -m/-F options to read logs from elsewhere (diff) | |
| download | tgif-0074d18dc0d816f9842d3e0e1cd0b26341715b37.tar.xz | |
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 't/t5515/refs.br-branches-one-octopus_branches-one')
0 files changed, 0 insertions, 0 deletions