Merge branch 'rr/rebase-autostash'

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 9ae2508f3fb79b9da5fb4481a4fe2120f4a082b1..d88a6fcb29395ac200930191518fdbceca78bbd4 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -186,8 +186,7 @@ See also <<FILES>>.
        Opens an editor to modify the specified config file; either
        '--system', '--global', or repository (default).
 
---includes::
---no-includes::
+--[no-]includes::
        Respect `include.*` directives in config files when looking up
        values. Defaults to on.