summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-23 14:51:58 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-23 14:51:59 -0700
commit1a22bd31f0a5130ce6c934951a5526ceb774c2be (patch)
tree5fc1ad424560163872206ebf3c90a1ca6e945b5f /Documentation/config.txt
parent3e7a5b489e45ae8a3a0b222893d58b172d883136 (diff)
parent0e254bbd22ba3f62c0bbf5055c307391a5920eaa (diff)
downloadgit-1a22bd31f0a5130ce6c934951a5526ceb774c2be.tar.gz
Merge branch 'jg/status-config'
"git status" learned status.branch and status.short configuration variables to use --branch and --short options by default (override with --no-branch and --no-short options from the command line). * jg/status-config: status: introduce status.branch to enable --branch by default status: introduce status.short to enable --short by default
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 311fcebaf5..8a975a6390 100644
--- 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