Merge branch 'maint'

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 58d35fb3c257d76f6c26b3dcbbacdbed7327499a..b3dfa42cc0211dbd8881f471ac287fa0b9cd5915 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -114,8 +114,8 @@ compatibility) and `color.status.<slot>` configuration variables
 to colorize its output.
 
 If the config variable `status.relativePaths` is set to false, then all
-paths shown in the long format are relative to the repository root, not
-to the current directory.
+paths shown are relative to the repository root, not to the current
+directory.
 
 If `status.submodulesummary` is set to a non zero number or true (identical
 to -1 or an unlimited number), the submodule summary will be enabled for