Merge branch 'cb/rebase-am-exit-code'

diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 9f23a861ce3a8dfd009532b469290cb6470b500d..e6e947c808d5e419a9d974d63ab7b95195b667c8 100644 (file)
--- 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