From de0bc11d138e95f3b59db8f6739afb4ce0ce58e0 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Fri, 3 Nov 2017 12:21:58 -0700 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/config.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index 2271809d90..2102f070d4 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 -- 2.11.4.GIT