-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
config.txt: move mailmap.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
- Loading branch information
Showing
2 changed files
with
16 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
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]. | ||
|
||
mailmap.blob:: | ||
Like `mailmap.file`, but consider the value as a reference to a | ||
blob in the repository. If both `mailmap.file` and | ||
`mailmap.blob` are given, both are parsed, with entries from | ||
`mailmap.file` taking precedence. In a bare repository, this | ||
defaults to `HEAD:.mailmap`. In a non-bare repository, it | ||
defaults to empty. |