Merge branch 'jc/format-color-auto'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 376007797c3a3d977991b50814eb6c29a03d14e9..0e206759fd3dcd6c1dd600cf0532676222d52642 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -140,10 +140,11 @@ advice.*::
        can tell Git that you do not need help by setting these to 'false':
 +
 --
-       pushNonFastForward::
+       pushUpdateRejected::
                Set this variable to 'false' if you want to disable
-               'pushNonFFCurrent', 'pushNonFFDefault', and
-               'pushNonFFMatching' simultaneously.
+               'pushNonFFCurrent', 'pushNonFFDefault',
+               'pushNonFFMatching', and 'pushAlreadyExists'
+               simultaneously.
        pushNonFFCurrent::
                Advice shown when linkgit:git-push[1] fails due to a
                non-fast-forward update to the current branch.
@@ -158,6 +159,9 @@ advice.*::
                'matching refs' explicitly (i.e. you used ':', or
                specified a refspec that isn't your current branch) and
                it resulted in a non-fast-forward error.
+       pushAlreadyExists::
+               Shown when linkgit:git-push[1] rejects an update that
+               does not qualify for fast-forwarding (e.g., a tag.)
        statusHints::
                Show directions on how to proceed from the current
                state in the output of linkgit:git-status[1], in
@@ -1519,9 +1523,11 @@ mailmap.file::
 
 mailmap.blob::
        Like `mailmap.file`, but consider the value as a reference to a
-       blob in the repository (e.g., `HEAD:.mailmap`). If both
-       `mailmap.file` and `mailmap.blob` are given, both are parsed,
-       with entries from `mailmap.file` taking precedence.
+       blob in the repository. If both `mailmap.file` and
+       `mailmap.blob` are given, both are parsed, with entries from
+       `mailmap.file` taking precedence. In a bare repository, this
+       defaults to `HEAD:.mailmap`. In a non-bare repository, it
+       defaults to empty.
 
 man.viewer::
        Specify the programs that may be used to display help in the