diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-24 04:03:33 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-24 04:03:33 +0000 |
| commit | ccc2f7606414a57fc7f34d2f88f8fb2246918d6d (patch) | |
| tree | 086aa0acaa44a0fadc1de3344e5121f865623f32 /git-rerere.html | |
| parent | 0868a302deebe5253106fdf9af00c82e2c711e66 (diff) | |
| download | git-htmldocs-ccc2f7606414a57fc7f34d2f88f8fb2246918d6d.tar.gz | |
Autogenerated HTML docs for v1.6.0-rc0-42-g186458
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rerere.html b/git-rerere.html index b57915996..95331b9ac 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -354,7 +354,7 @@ its working state.</p></div> <dd>
<p>
This resets the metadata used by rerere if a merge resolution is to be
-is aborted. Calling <em>git-am --skip</em> or <em>git-rebase [--skip|--abort]</em>
+aborted. Calling <em>git-am [--skip|--abort]</em> or <em>git-rebase [--skip|--abort]</em>
will automatically invoke this command.
</p>
</dd>
@@ -529,7 +529,7 @@ conflict.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-22 09:19:15 UTC
+Last updated 2008-07-24 04:02:42 UTC
</div>
</div>
</body>
|