diff options
Diffstat (limited to 'Documentation/rerere-options.adoc')
| -rw-r--r-- | Documentation/rerere-options.adoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc index b0b920144a..4395fe0535 100644 --- a/Documentation/rerere-options.adoc +++ b/Documentation/rerere-options.adoc @@ -4,6 +4,6 @@ the current conflict to update the files in the working tree, allow it to also update the index with the result of resolution. `--no-rerere-autoupdate` is a good way to - double-check what `rerere` did and catch potential + double-check what linkgit:git-rerere[1] did and catch potential mismerges, before committing the result to the index with a - separate `git add`. + separate linkgit:git-add[1]. |