diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-01-17 17:42:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-01-17 17:42:30 +0000 |
| commit | f9771f69968326f60eaa1b69efe27a302998c755 (patch) | |
| tree | 14f148fe4a54b0f8dfccc83b7dbd37034216d385 /git-rerere.html | |
| parent | 8f76dc6fae3bb5536b36c987aa521322dcdd220c (diff) | |
| download | git-htmldocs-f9771f69968326f60eaa1b69efe27a302998c755.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc1-g23bf
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 a43098e16..2cd980d93 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -307,7 +307,7 @@ its working state.</p> <p>
This resets the metadata used by rerere if a merge resolution is to be
is aborted. Calling <a href="git-am.html">git-am(1)</a> --skip or <a href="git-rebase.html">git-rebase(1)</a>
-[--skip|--abort] will automatcally invoke this command.
+[--skip|--abort] will automatically invoke this command.
</p>
</dd>
<dt>
@@ -482,7 +482,7 @@ conflict.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 15-Jan-2007 06:12:33 UTC
+Last updated 17-Jan-2007 17:42:16 UTC
</div>
</div>
</body>
|