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.html | |
| parent | fd468962039a6dcb0cd360ac60a3e7631b2b3b5d (diff) | |
| download | git-htmldocs-89d4e0f4569738d0b1885879bf6ed88a972cd3da.tar.gz | |
Autogenerated HTML docs for v1.5.0-50-gb7581
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/git-rerere.html b/git-rerere.html index 2a2beef86..c279b3b81 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -437,8 +437,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 <tt>git-rerere</tt> leaves the index file alone,
so you still need to do the final sanity checks with <tt>git diff</tt>
-(or <tt>git diff -c</tt>) and <tt>git update-index</tt> when you are
-satisfied.</p>
+(or <tt>git diff -c</tt>) and <tt>git add</tt> when you are satisfied.</p>
<p>As a convenience measure, <tt>git-merge</tt> automatically invokes
<tt>git-rerere</tt> when it exits with a failed automerge, which
records it if it is a new conflict, or reuses the earlier hand
@@ -482,7 +481,7 @@ conflict.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 19-Jan-2007 00:37:32 UTC
+Last updated 18-Feb-2007 00:34:42 UTC
</div>
</div>
</body>
|