From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH] config: document blame configuration
Date: Wed, 1 Nov 2017 15:32:34 -0700 [thread overview]
Message-ID: <20171101223234.14527-1-sbeller@google.com> (raw)
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>
---
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
next reply other threads:[~2017-11-01 22:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-01 22:32 Stefan Beller [this message]
2017-11-02 0:07 ` [PATCH] config: document blame configuration SZEDER Gábor
2017-11-02 18:10 ` [PATCHv2] " Stefan Beller
2017-11-03 1:26 ` SZEDER Gábor
2017-11-03 2:27 ` Stefan Beller
2017-11-03 19:21 ` [PATCH] " Stefan Beller
2017-11-06 1:14 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171101223234.14527-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).