summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-24 12:21:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-24 12:21:41 -0700
commit20d16da5caf85801b8b606e2c9a3fa8a5c261e64 (patch)
tree66bb911cd8625e7dae714315bd7482742131140c /Documentation
parentMerge branch 'jc/do-not-feed-tags-to-clear-commit-marks' (diff)
parentblame: add blame.showEmail configuration (diff)
downloadtgif-20d16da5caf85801b8b606e2c9a3fa8a5c261e64.tar.xz
Merge branch 'qn/blame-show-email'
"git blame" learned blame.showEmail configuration variable. * qn/blame-show-email: blame: add blame.showEmail configuration
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-blame.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 9f23a861ce..e6e947c808 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -76,6 +76,8 @@ include::blame-options.txt[]
-e::
--show-email::
Show the author email instead of author name (Default: off).
+ This can also be controlled via the `blame.showEmail` config
+ option.
-w::
Ignore whitespace when comparing the parent's version and