X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rerere.txt;h=7ff9b05e680cabc6513f9d8a6aa80eb7eccda82d;hb=dfaa61bd524799d61b50bbbcee8b7972910ea41c;hp=139b6eb7733aaf246af8ce77f6483fa15e5de2b0;hpb=67c7575947b06a2a9bbdb355357895149bdbd8e5;p=git.git diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 139b6eb77..7ff9b05e6 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -163,8 +163,7 @@ If this three-way merge resolves cleanly, the result is written out to your working tree file, so you would not have to manually resolve it. Note that `git-rerere` leaves the index file alone, so you still need to do the final sanity checks with `git diff` -(or `git diff -c`) and `git update-index` when you are -satisfied. +(or `git diff -c`) and `git add` when you are satisfied. As a convenience measure, `git-merge` automatically invokes `git-rerere` when it exits with a failed automerge, which