diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:02:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:02:10 -0700 |
| commit | 5d04924e1914a0c63b6467b8cb7194bf68c003cb (patch) | |
| tree | 8b25ce5850f7ec792c6c69972584eec2f9062174 /Documentation/config.txt | |
| parent | 03da85b954507749af01545888a20b7643761d58 (diff) | |
| parent | 6a38ef2ced55f0a8a7967581934e40f79e1d8733 (diff) | |
| download | git-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 '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 b3023b8172..975d3d18d5 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. |