Merge branch 'bc/checkout-tracking-name-plug-leak'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 8a975a63902379d09532df79b463d021120a88e8..1153585aa2e2d19dd41f8cf81465e8b6d858a028 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -199,6 +199,9 @@ advice.*::
        amWorkDir::
                Advice that shows the location of the patch file when
                linkgit:git-am[1] fails to apply it.
+       rmHints::
+               In case of failure in the output of linkgit:git-rm[1],
+               show directions on how to proceed from the current state.
 --
 
 core.fileMode::
@@ -2075,14 +2078,6 @@ status.relativePaths::
        relative to the repository root (this was the default for Git
        prior to v1.5.4).
 
-status.short::
-       Set to true to enable --short by default in linkgit:git-status[1].
-       The option --no-short takes precedence over this variable.
-
-status.branch::
-       Set to true to enable --branch by default in linkgit:git-status[1].
-       The option --no-branch takes precedence over this variable.
-
 status.showUntrackedFiles::
        By default, linkgit:git-status[1] and linkgit:git-commit[1] show
        files which are not currently tracked by Git. Directories which