diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-02-18 00:34:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-02-18 00:34:59 +0000 |
| commit | 89d4e0f4569738d0b1885879bf6ed88a972cd3da (patch) | |
| tree | 42b660ac1ea500caecdcdf951b7c1b3d307fa6cf /git-rerere.txt | |
| parent | fd468962039a6dcb0cd360ac60a3e7631b2b3b5d (diff) | |
| download | git-htmldocs-89d4e0f4569738d0b1885879bf6ed88a972cd3da.tar.gz | |
Autogenerated HTML docs for v1.5.0-50-gb7581
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index 139b6eb77..7ff9b05e6 100644 --- a/git-rerere.txt +++ b/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 |