Merge branch 'jg/status-config'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 311fcebaf51034a0788df971749fe80dbc3c8782..8a975a63902379d09532df79b463d021120a88e8 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2075,6 +2075,14 @@ status.relativePaths::
        relative to the repository root (this was the default for Git
        prior to v1.5.4).
 
+status.short::
+       Set to true to enable --short by default in linkgit:git-status[1].
+       The option --no-short takes precedence over this variable.
+
+status.branch::
+       Set to true to enable --branch by default in linkgit:git-status[1].
+       The option --no-branch takes precedence over this variable.
+
 status.showUntrackedFiles::
        By default, linkgit:git-status[1] and linkgit:git-commit[1] show
        files which are not currently tracked by Git. Directories which