path: root/Documentation/git-rerere.txt
diff options
authorShawn O. Pearce <>2007-02-17 09:43:42 (GMT)
committerJunio C Hamano <>2007-02-17 18:20:27 (GMT)
commitd7f078b8b92b1a29f9dd62c2c470fa51e15e2ffa (patch)
tree20f6c599862aaa92534de70cf76d7289e0b3aeea /Documentation/git-rerere.txt
parent5ca2db53763ed93a75de7ddbda753fc09327d7aa (diff)
Convert update-index references in docs to add.
Since `git add` is the approved porcelain for an end-user to invoke when they want to manipulate the index, porcelain documentation should steer the user to this command rather than the pure plumbing update-index. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-rerere.txt')
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 139b6eb..7ff9b05 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
+(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