diff options
Diffstat (limited to 'Documentation/config/advice.txt')
| -rw-r--r-- | Documentation/config/advice.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index 971aad2..83c2a95 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -67,10 +67,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 refresh the index - after reset. + resetNoRefresh:: + Advice to consider using the `--no-refresh` option to + linkgit:git-reset[1] 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. |