aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-03-13 19:59:16 +0700
committerJunio C Hamano <gitster@pobox.com>2013-03-16 21:44:58 -0700
commit6a38ef2ced55f0a8a7967581934e40f79e1d8733 (patch)
treeff6faf20d9fdab3d77c864527f13137051ad45ed /Documentation/config.txt
parent5823eb2b28696bf0eb25f6ca35b303447869f85c (diff)
downloadgit-6a38ef2ced55f0a8a7967581934e40f79e1d8733.tar.gz
git-6a38ef2ced55f0a8a7967581934e40f79e1d8733.tar.xz
status: advise to consider use of -u when read_directory takes too long
Introduce advice.statusUoption to suggest considering use of -u to strike different trade-off when it took more than 2 seconds to enumerate untracked/ignored files. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index d1de85778..a16eda5d4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -163,6 +163,10 @@ advice.*::
state in the output of linkgit:git-status[1] and in
the template shown when writing commit messages in
linkgit:git-commit[1].
+ statusUoption::
+ Advise to consider using the `-u` option to linkgit:git-status[1]
+ when the command takes more than 2 seconds to enumerate untracked
+ files.
commitBeforeMerge::
Advice shown when linkgit:git-merge[1] refuses to
merge to avoid overwriting local changes.