diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-02-17 04:43:42 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-17 10:20:27 -0800 |
| commit | d7f078b8b92b1a29f9dd62c2c470fa51e15e2ffa (patch) | |
| tree | 20f6c599862aaa92534de70cf76d7289e0b3aeea /Documentation/git-rerere.txt | |
| parent | 5ca2db53763ed93a75de7ddbda753fc09327d7aa (diff) | |
| download | git-d7f078b8b92b1a29f9dd62c2c470fa51e15e2ffa.tar.gz | |
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 <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-rerere.txt')
| -rw-r--r-- | Documentation/git-rerere.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 139b6eb773..7ff9b05e68 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 |