Merge branch 'maint'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 736fcd71cce107969c93cbd06490b3956be72a1b..79d51f26ccfa69a3785e6bebcbdce9b320d96e6d 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -762,6 +762,12 @@ showbranch.default::
        The default set of branches for gitlink:git-show-branch[1].
        See gitlink:git-show-branch[1].
 
+status.relativePaths::
+       By default, gitlink:git-status[1] shows paths relative to the
+       current directory. Setting this variable to `false` shows paths
+       relative to the repository root (this was the default for git
+       prior to v1.5.4).
+
 tar.umask::
        This variable can be used to restrict the permission bits of
        tar archive entries.  The default is 0002, which turns off the