diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-01 09:19:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-01 09:19:30 -0700 |
commit | fec274b01f39262f945edb64c14c3bfe130b5bef (patch) | |
tree | a1b30b637f50bd78c19bf3611ff2fae52056b40a /advice.h | |
parent | 41e603af58c3814d06e1c2b5d1449d516007a255 (diff) | |
parent | 6a38ef2ced55f0a8a7967581934e40f79e1d8733 (diff) | |
download | git-fec274b01f39262f945edb64c14c3bfe130b5bef.tar.gz git-fec274b01f39262f945edb64c14c3bfe130b5bef.tar.xz |
Merge branch 'tb/document-status-u-tradeoff' into maint
* 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.h')
-rw-r--r-- | advice.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -11,6 +11,7 @@ extern int advice_push_already_exists; extern int advice_push_fetch_first; extern int advice_push_needs_force; extern int advice_status_hints; +extern int advice_status_u_option; extern int advice_commit_before_merge; extern int advice_resolve_conflict; extern int advice_implicit_identity; |