diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-26 09:17:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-26 09:17:34 +0000 |
| commit | 69f491759956153218a1ac862629c439a194d865 (patch) | |
| tree | 5d2f59bda595624f8ebb6948123a0faf89420d40 /git-am.html | |
| parent | 601f3e57cda1c2d25f08c890f345bc7239802d25 (diff) | |
| download | git-htmldocs-69f491759956153218a1ac862629c439a194d865.tar.gz | |
Autogenerated HTML docs for v1.5.4.3-230-g2db511
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html index 70c6f87ce..bfa9169ad 100644 --- a/git-am.html +++ b/git-am.html @@ -488,7 +488,7 @@ hand resolve the conflict in the working directory, and update </ol>
<p>The command refuses to process new mailboxes while <tt>.dotest</tt>
directory exists, so if you decide to start over from scratch,
-run <tt>rm -f .dotest</tt> before running the command with mailbox
+run <tt>rm -f -r .dotest</tt> before running the command with mailbox
names.</p>
</div>
<h2>SEE ALSO</h2>
@@ -509,7 +509,7 @@ names.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 07-Jan-2008 07:50:00 UTC
+Last updated 26-Feb-2008 09:16:45 UTC
</div>
</div>
</body>
|