summaryrefslogtreecommitdiff
path: root/advice.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-21 14:02:10 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-21 14:02:10 -0700
commit5d04924e1914a0c63b6467b8cb7194bf68c003cb (patch)
tree8b25ce5850f7ec792c6c69972584eec2f9062174 /advice.c
parent03da85b954507749af01545888a20b7643761d58 (diff)
parent6a38ef2ced55f0a8a7967581934e40f79e1d8733 (diff)
downloadgit-5d04924e1914a0c63b6467b8cb7194bf68c003cb.tar.gz
Merge branch 'tb/document-status-u-tradeoff'
Suggest users to look into using--untracked=no option when "git status" takes too long. * tb/document-status-u-tradeoff: status: advise to consider use of -u when read_directory takes too long git status: document trade-offs in choosing parameters to the -u option
Diffstat (limited to 'advice.c')
-rw-r--r--advice.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/advice.c b/advice.c
index 780f58da0f..3bc86260b8 100644
--- a/advice.c
+++ b/advice.c
@@ -8,6 +8,7 @@ int advice_push_already_exists = 1;
int advice_push_fetch_first = 1;
int advice_push_needs_force = 1;
int advice_status_hints = 1;
+int advice_status_u_option = 1;
int advice_commit_before_merge = 1;
int advice_resolve_conflict = 1;
int advice_implicit_identity = 1;
@@ -25,6 +26,7 @@ static struct {
{ "pushfetchfirst", &advice_push_fetch_first },
{ "pushneedsforce", &advice_push_needs_force },
{ "statushints", &advice_status_hints },
+ { "statusuoption", &advice_status_u_option },
{ "commitbeforemerge", &advice_commit_before_merge },
{ "resolveconflict", &advice_resolve_conflict },
{ "implicitidentity", &advice_implicit_identity },