diff options
| author |  Ben Peart <benpeart@microsoft.com> | 2018-10-23 15:04:23 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-24 11:57:08 +0900 |
| commit | 649bf3a42f344e71b1b5a7f562576f911a1f7423 (patch) | |
| tree | c5559a7735da4ad4c8562dbf6234c891929bdfa8 /Documentation | |
| parent | reset: add new reset.quiet config setting (diff) | |
| download | tgif-649bf3a42f344e71b1b5a7f562576f911a1f7423.tar.xz | |
reset: warn when refresh_index() takes more than 2 seconds
refresh_index() is done after a reset command as an optimization. Because
it can be an expensive call, warn the user if it takes more than 2 seconds
and tell them how to avoid it using the --quiet command line option or
reset.quiet config setting.
Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -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 fef680f886..ce26a743ba 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -333,6 +333,10 @@ advice.*:: commitBeforeMerge:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwriting local changes. + resetQuiet:: + Advice to consider using the `--quiet` option to linkgit:git-reset[1] + when the command takes more than 2 seconds to enumerate unstaged + changes after reset. resolveConflict:: Advice shown by various commands when conflicts prevent the operation from being performed. |