Merge branch 'jk/show-branch-strbuf' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index b82e0816cbd775de8d34b3af2afb21c97d98bbf7..bc750d579464a8c6c2e534e17ecae6d3a66287a9 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -178,6 +178,10 @@ advice.*::
                the template shown when writing commit messages in
                linkgit:git-commit[1], and in the help message shown
                by linkgit:git-checkout[1] when switching branch.
+       statusUoption::
+               Advise to consider using the `-u` option to linkgit:git-status[1]
+               when the command takes more than 2 seconds to enumerate untracked
+               files.
        commitBeforeMerge::
                Advice shown when linkgit:git-merge[1] refuses to
                merge to avoid overwriting local changes.