diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:05:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:05:34 -0700 |
| commit | e29497d28ce1ec9f76493542fcab4a8d61ca5fce (patch) | |
| tree | 55d90189d8c1d3acb829a983f4aae292a8d4d7bf /Documentation/config.txt | |
| parent | 04ce89389d37097da250c9879bddc9f59443a704 (diff) | |
| parent | 84b4202d804c7faec76f3eab22744b6288c63481 (diff) | |
| download | git-e29497d28ce1ec9f76493542fcab4a8d61ca5fce.tar.gz git-e29497d28ce1ec9f76493542fcab4a8d61ca5fce.tar.xz | |
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/commit: make sure --porcelain is not affected by user-facing config
commit: make it work with status.short
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.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8d6859fa6..81856dd5a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2112,6 +2112,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 |