summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-31 22:31:03 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-31 22:31:03 -0800
commit873ce7c8d5a57b5f8f3bcc8f9905dac13cb38988 (patch)
tree1a111a51469d2262add23f2dcbba7c644f1ac474 /.mailmap
parentaf6b37fab1a97943c804f4983452c7fde5b0fbbe (diff)
parentf26af3fcbcbd27392b8c94b1e4eb6e671b2466ab (diff)
downloadgit-873ce7c8d5a57b5f8f3bcc8f9905dac13cb38988.tar.gz
Merge branch 'tr/merge-edit-guidance'
* tr/merge-edit-guidance: merge: add instructions to the commit message when editing
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions