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 <sbel...@google.com>
---
Documentation/config.txt | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1ac0ae6adb..b18cead6aa 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.root::
+ Do not treat root commits as boundaries in `git-blame`.
+ This option defaults to false.
+
+blame.blankboundary::
+ Show blank SHA-1 for boundary commits in `git-blame`.
+ This option defaults to false.
+
+blame.showemail::
+ Show the author email instead of author name in `git-blame`.
+ This option defaults to false.
+
+blame.date::
+ Specifies the format used to output dates in `git-blame`.
+ 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.15.0.7.g980e40477f
