diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-24 19:18:07 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 19:18:07 +0400 |
| commit | 908a0e6b98e5a7c4b299b3643823bdefb4fa512e (patch) | |
| tree | bf2121d7fd055264b4d1504283aebed64c13552f /Documentation/config.txt | |
| parent | 1f3a412dfaf2d12583e3286c6d20b403da8cc963 (diff) | |
Revert "Merge branch 'jg/status-config'"
This reverts commit 1a22bd31f0a5130ce6c934951a5526ceb774c2be, reversing
changes made to 3e7a5b489e45ae8a3a0b222893d58b172d883136.
It makes it impossible to "git commit" when status.short is set, and
also "git status --porcelain" output is affected by status.branch.
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8a975a6390..311fcebaf5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2075,14 +2075,6 @@ 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 |