summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-15 03:04:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-15 03:04:59 (GMT)
commit4a1ddb561cad07277be60a6e04513da5eb9db582 (patch)
treea2e3caf186fc954ab99d36a57e331f47dfc2523c /Documentation/config.txt
parentea3321992b280bb0b8ea781a62e9194ba93ebde0 (diff)
parentde0bc11d138e95f3b59db8f6739afb4ce0ce58e0 (diff)
downloadgit-4a1ddb561cad07277be60a6e04513da5eb9db582.zip
git-4a1ddb561cad07277be60a6e04513da5eb9db582.tar.gz
git-4a1ddb561cad07277be60a6e04513da5eb9db582.tar.bz2
Merge branch 'sb/blame-config-doc' into maint
Description of blame.{showroot,blankboundary,showemail,date} configuration variables have been added to "git config --help". * sb/blame-config-doc: config: document blame configuration
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt17
1 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1ac0ae6..9593bfa 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -949,6 +949,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