summaryrefslogtreecommitdiff
path: root/Documentation/gitmailmap.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-01-25 14:19:20 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-25 14:19:20 -0800
commitb7bb322cba9f45f6b0294b7d1ef272013902b169 (patch)
treeef712b149cf1b49d95f2497dbd0619f2c68d1897 /Documentation/gitmailmap.txt
parentMerge branch 'tb/pack-revindex-api' (diff)
parentt4203: make blame output massaging more robust (diff)
downloadtgif-b7bb322cba9f45f6b0294b7d1ef272013902b169.tar.xz
Merge branch 'ab/mailmap-fixup'
Follow-up fixes and improvements to ab/mailmap topic. * ab/mailmap-fixup: t4203: make blame output massaging more robust mailmap doc: use correct environment variable 'GIT_WORK_TREE' t4203: stop losing return codes of git commands test-lib-functions.sh: fix usage for test_commit()
Diffstat (limited to 'Documentation/gitmailmap.txt')
-rw-r--r--Documentation/gitmailmap.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitmailmap.txt b/Documentation/gitmailmap.txt
index 7f1089786d..052209b33b 100644
--- a/Documentation/gitmailmap.txt
+++ b/Documentation/gitmailmap.txt
@@ -7,7 +7,7 @@ gitmailmap - Map author/committer names and/or E-Mail addresses
SYNOPSIS
--------
-$GIT_WORK_DIR/.mailmap
+$GIT_WORK_TREE/.mailmap
DESCRIPTION