diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:42 -0800 |
| commit | 9bdccbcda77df036edef5badda76418d0ae80997 (patch) | |
| tree | 01e0f13bd58c86ff366225327ca49fc79a3af0ca /Documentation | |
| parent | f712632a518ffd2611ae4a33cce43b53c73ce2c1 (diff) | |
| parent | a38cb9878ab686d3b7a19e46d8c3fff79cdccf4b (diff) | |
| download | git-9bdccbcda77df036edef5badda76418d0ae80997.tar.xz | |
Merge branch 'jk/mailmap-only-at-root'
The .mailmap is documented to be read only from the root level of a
working tree, but a stray file in a bare repository also was read
by accident, which has been corrected.
* jk/mailmap-only-at-root:
mailmap: only look for .mailmap in work tree
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-shortlog.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index c16cc3b608..c9c7f3065c 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -113,6 +113,10 @@ MAPPING AUTHORS See linkgit:gitmailmap[5]. +Note that if `git shortlog` is run outside of a repository (to process +log contents on standard input), it will look for a `.mailmap` file in +the current directory. + GIT --- Part of the linkgit:git[1] suite |