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>
Stefan Beller committed
Nov 3, 2017 at 12:21 UTC
de0bc11d138e95f3b59db8f6739afb4ce0ce58e0
1 file changed
+17
Documentation/config.txt
+17
@@ -943,6 +943,23 @@ apply.whitespace::
943
Tells 'git apply' how to handle whitespaces, in the same way
944
as the `--whitespace` option. See linkgit:git-apply[1].
945
946
+blame.showRoot::
947
+ Do not treat root commits as boundaries in linkgit:git-blame[1].
948
+ This option defaults to false.
949
+
950
+blame.blankBoundary::
951
+ Show blank commit object name for boundary commits in
952
+ linkgit:git-blame[1]. This option defaults to false.
953
+
954
+blame.showEmail::
955
+ Show the author email instead of author name in linkgit:git-blame[1].
956
+ This option defaults to false.
957
+
958
+blame.date::
959
+ Specifies the format used to output dates in linkgit:git-blame[1].
960
+ If unset the iso format is used. For supported values,
961
+ see the discussion of the `--date` option at linkgit:git-log[1].
962
+
963
branch.autoSetupMerge::
964
Tells 'git branch' and 'git checkout' to set up new branches
965
so that linkgit:git-pull[1] will appropriately merge from the