diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-15 01:44:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-15 01:44:15 -0800 |
| commit | 160d2bc35382fb23beb99457e9111d15554bf223 (patch) | |
| tree | ec3722d8676e73f69c0ab172cf44a06c7aac5fc6 /Documentation/config.txt | |
| parent | 2a8644c7f163e4b76a36739ba936f8d5d91c3cf4 (diff) | |
| parent | 7d48e9e6f77d336376c1a554eeff0590f77e1ee1 (diff) | |
| download | git-160d2bc35382fb23beb99457e9111d15554bf223.tar.gz git-160d2bc35382fb23beb99457e9111d15554bf223.tar.xz | |
Merge branch 'ms/mailmap'
* ms/mailmap:
Move mailmap documentation into separate file
Change current mailmap usage to do matching on both name and email of author/committer.
Add map_user() and clear_mailmap() to mailmap
Add find_insert_index, insert_at_index and clear_func functions to string_list
Add mailmap.file as configurational option for mailmap location
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1806a6061..f5152c503 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1019,6 +1019,14 @@ log.showroot:: Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which normally hide the root commit will now show it. True by default. +mailmap.file:: + The location of an augmenting mailmap file. The default + mailmap, located in the root of the repository, is loaded + first, then the mailmap file pointed to by this variable. + The location of the mailmap file may be in a repository + subdirectory, or somewhere outside of the repository itself. + See linkgit:git-shortlog[1] and linkgit:git-blame[1]. + man.viewer:: Specify the programs that may be used to display help in the 'man' format. See linkgit:git-help[1]. |