diff options
| author |  Jeff King <peff@peff.net> | 2012-12-12 06:04:04 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-12-12 11:12:35 -0800 |
| commit | 086109006f695166daf2934417a20681b0c94ab8 (patch) | |
| tree | d249ca71b8fa4caf806790de5853bf2dd3df2138 /Documentation | |
| parent | mailmap: refactor mailmap parsing for non-file sources (diff) | |
| download | tgif-086109006f695166daf2934417a20681b0c94ab8.tar.xz | |
mailmap: support reading mailmap from blobs
In a bare repository, there isn't a simple way to respect an
in-tree mailmap without extracting it to a temporary file.
This patch provides a config variable, similar to
mailmap.file, which reads the mailmap from a blob in the
repository.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index bf8f911e1f..376007797c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1517,6 +1517,12 @@ mailmap.file:: subdirectory, or somewhere outside of the repository itself. See linkgit:git-shortlog[1] and linkgit:git-blame[1]. +mailmap.blob:: + Like `mailmap.file`, but consider the value as a reference to a + blob in the repository (e.g., `HEAD:.mailmap`). If both + `mailmap.file` and `mailmap.blob` are given, both are parsed, + with entries from `mailmap.file` taking precedence. + man.viewer:: Specify the programs that may be used to display help in the 'man' format. See linkgit:git-help[1]. |