summaryrefslogtreecommitdiff
path: root/gitk-git
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-11-08 15:38:07 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-09 22:27:11 -0800
commited7a42a0752fd71cf04273b8e691966dd2c33ebe (patch)
tree222f7e6815eecc11fb319526172e275e15d75ae5 /gitk-git
parentmerge: force edit and no-ff mode when merging a tag object (diff)
downloadtgif-ed7a42a0752fd71cf04273b8e691966dd2c33ebe.tar.xz
commit: teach --amend to carry forward extra headers
After running "git pull $there for-linus" to merge a signed tag, the integrator may need to amend the resulting merge commit to fix typoes in it. Teach --amend option to read the existing extra headers, and carry them forward. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitk-git')
0 files changed, 0 insertions, 0 deletions