summaryrefslogtreecommitdiff
path: root/Documentation/config/advice.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/config/advice.txt')
-rw-r--r--Documentation/config/advice.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index c40eb09cb7..971aad2f23 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -69,8 +69,8 @@ advice.*::
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.
+ when the command takes more than 2 seconds to refresh the index
+ after reset.
resolveConflict::
Advice shown by various commands when conflicts
prevent the operation from being performed.