diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-11-09 14:31:25 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-09 14:31:25 +0900 |
commit | 4da9f598e66fb2f2abcd3770c8253edbe0858190 (patch) | |
tree | 8b9c0ca0c1a28f8656fcb81f1d62938822c6cd78 | |
parent | 5ee882da537bcd939eae564330a775601cf65a58 (diff) | |
parent | de0bc11d138e95f3b59db8f6739afb4ce0ce58e0 (diff) | |
download | git-4da9f598e66fb2f2abcd3770c8253edbe0858190.tar.gz |
Merge branch 'sb/blame-config-doc'
Description of blame.{showroot,blankboundary,showemail,date}
configuration variables have been added to "git config --help".
* sb/blame-config-doc:
config: document blame configuration
-rw-r--r-- | Documentation/config.txt | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5f0d62753d..671fcbaa0f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -952,6 +952,23 @@ apply.whitespace:: Tells 'git apply' how to handle whitespaces, in the same way as the `--whitespace` option. See linkgit:git-apply[1]. +blame.showRoot:: + Do not treat root commits as boundaries in linkgit:git-blame[1]. + This option defaults to false. + +blame.blankBoundary:: + Show blank commit object name for boundary commits in + linkgit:git-blame[1]. This option defaults to false. + +blame.showEmail:: + Show the author email instead of author name in linkgit:git-blame[1]. + This option defaults to false. + +blame.date:: + Specifies the format used to output dates in linkgit:git-blame[1]. + If unset the iso format is used. For supported values, + see the discussion of the `--date` option at linkgit:git-log[1]. + branch.autoSetupMerge:: Tells 'git branch' and 'git checkout' to set up new branches so that linkgit:git-pull[1] will appropriately merge from the |