Merge branch 'tb/document-status-u-tradeoff' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:30 +0000 (09:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:30 +0000 (09:19 -0700)
commitfec274b01f39262f945edb64c14c3bfe130b5bef
treea1b30b637f50bd78c19bf3611ff2fae52056b40a
parent41e603af58c3814d06e1c2b5d1449d516007a255
parent6a38ef2ced55f0a8a7967581934e40f79e1d8733
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
Documentation/config.txt
Documentation/git-status.txt
advice.c
advice.h
t/t7508-status.sh
t/t7512-status-help.sh
wt-status.c
wt-status.h