Merge branch 'pw/rebase-i-regression-fix-tests' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 67f8c8fe517f18b2fcc5338d48968bf46a382930..a6a589a7353ca7051a94c74b794627a84d60f86c 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -345,7 +345,7 @@ core.fileMode::
        is to be honored.
 +
 Some filesystems lose the executable bit when a file that is
-marked as executable is checked out, or checks out an
+marked as executable is checked out, or checks out a
 non-executable file with executable bit on.
 linkgit:git-clone[1] or linkgit:git-init[1] probe the filesystem
 to see if it handles the executable bit correctly
@@ -873,6 +873,7 @@ core.abbrev::
        computed based on the approximate number of packed objects
        in your repository, which hopefully is enough for
        abbreviated object names to stay unique for some time.
+       The minimum length is 4.
 
 add.ignoreErrors::
 add.ignore-errors (deprecated)::