diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-01 16:19:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-01 16:19:30 (GMT) |
| commit | fec274b01f39262f945edb64c14c3bfe130b5bef (patch) | |
| tree | a1b30b637f50bd78c19bf3611ff2fae52056b40a /Documentation/git-merge.txt | |
| parent | 41e603af58c3814d06e1c2b5d1449d516007a255 (diff) | |
| parent | 6a38ef2ced55f0a8a7967581934e40f79e1d8733 (diff) | |
| download | git-fec274b01f39262f945edb64c14c3bfe130b5bef.zip git-fec274b01f39262f945edb64c14c3bfe130b5bef.tar.gz git-fec274b01f39262f945edb64c14c3bfe130b5bef.tar.bz2 | |
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 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions