diff options
| author | Stefan Beller <sbeller@google.com> | 2017-11-03 12:21:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 10:13:15 +0900 |
| commit | de0bc11d138e95f3b59db8f6739afb4ce0ce58e0 (patch) | |
| tree | 218f5cb17b1e5868e5bb1e26e3719ed96f721281 /Documentation | |
| parent | fc849d8d6b90e5c1e0c37bc0d60dd92b2fe7347f (diff) | |
| download | git-de0bc11d138e95f3b59db8f6739afb4ce0ce58e0.tar.gz git-de0bc11d138e95f3b59db8f6739afb4ce0ce58e0.tar.xz | |
config: document blame configuration
The options are currently only referenced by the git-blame man page,
also explain them in git-config, which is the canonical page to
contain all config options.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -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 2271809d9..2102f070d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -943,6 +943,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 |