summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-23 16:58:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-23 16:58:04 -0800
commit008adee2087e8e78f767bbfdfd49d1d1eabf9469 (patch)
tree9a1462ffc0d8cb8a222fa00e01111c7245c9a580 /Documentation/merge-options.txt
parentMerge branch 'ah/log-no-graph' (diff)
parentmailmap: change primary address for Derrick Stolee (diff)
downloadtgif-008adee2087e8e78f767bbfdfd49d1d1eabf9469.tar.xz
Merge branch 'ds/mailmap'
Update mailmap entries. * ds/mailmap: mailmap: change primary address for Derrick Stolee
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions