diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-16 03:23:57 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-16 03:23:57 +0000 |
| commit | f5a9362a72a5a586926fce49c90c93a75cbad2b5 (patch) | |
| tree | d4750ea1466329b97186f9eac8f898611a6fbbad /git-am.html | |
| parent | 38ddcce0c19a8eedec7a98bd291f65b2127a82b9 (diff) | |
| download | git-htmldocs-f5a9362a72a5a586926fce49c90c93a75cbad2b5.tar.gz | |
Autogenerated HTML docs for v1.5.6.3-384-gfcab4
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-am.html b/git-am.html index 4c7a7b7ee..cbff300d4 100644 --- a/git-am.html +++ b/git-am.html @@ -549,9 +549,9 @@ hand resolve the conflict in the working directory, and update </p>
</li>
</ol></div>
-<div class="para"><p>The command refuses to process new mailboxes while <tt>.dotest</tt>
+<div class="para"><p>The command refuses to process new mailboxes while <tt>.git/rebase</tt>
directory exists, so if you decide to start over from scratch,
-run <tt>rm -f -r .dotest</tt> before running the command with mailbox
+run <tt>rm -f -r .git/rebase</tt> before running the command with mailbox
names.</p></div>
<div class="para"><p>Before any patches are applied, ORIG_HEAD is set to the tip of the
current branch. This is useful if you have problems with multiple
@@ -577,7 +577,7 @@ errors in the "From:" lines).</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-15 15:48:33 UTC
+Last updated 2008-07-16 03:23:18 UTC
</div>
</div>
</body>
|