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 /Documentation/config.txt | |
| parent | 41e603af58c3814d06e1c2b5d1449d516007a255 (diff) | |
| parent | 6a38ef2ced55f0a8a7967581934e40f79e1d8733 (diff) | |
| download | git-fec274b01f39262f945edb64c14c3bfe130b5bef.tar.gz | |
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/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index b82e0816cb..bc750d5794 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -178,6 +178,10 @@ advice.*:: the template shown when writing commit messages in linkgit:git-commit[1], and in the help message shown by linkgit:git-checkout[1] when switching branch. + 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. |