summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-24 14:55:30 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-24 14:55:30 -0700
commit8ab949466f2182c01fb1955cca8b1bba8d2b431a (patch)
tree19acae4298989a51c54a899bd692221a768b44dc /config.txt
parent95eee388f597c3d88e76459da9d62bf8079cc69c (diff)
downloadgit-htmldocs-8ab949466f2182c01fb1955cca8b1bba8d2b431a.tar.gz
Autogenerated HTML docs for v1.8.3.1-585-g9832c
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt11
1 files changed, 3 insertions, 8 deletions
diff --git a/config.txt b/config.txt
index 8a975a639..1153585aa 100644
--- a/config.txt
+++ b/config.txt
@@ -199,6 +199,9 @@ advice.*::
amWorkDir::
Advice that shows the location of the patch file when
linkgit:git-am[1] fails to apply it.
+ rmHints::
+ In case of failure in the output of linkgit:git-rm[1],
+ show directions on how to proceed from the current state.
--
core.fileMode::
@@ -2075,14 +2078,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