diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-23 00:05:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-23 00:05:35 +0000 |
| commit | 78f25df845b9b3579ac0c29a415f8282599831d0 (patch) | |
| tree | 4aee14cbb399fcd65f87b1ed4dc70006fddc5612 /git-am.html | |
| parent | d2c978f6be36b38127b58af46e28e3ae590b2d3b (diff) | |
| download | git-htmldocs-78f25df845b9b3579ac0c29a415f8282599831d0.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-357-g1ea9
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-am.html b/git-am.html index cf175983e..87189052f 100644 --- a/git-am.html +++ b/git-am.html @@ -721,9 +721,9 @@ hand resolve the conflict in the working directory, and update </p>
</li>
</ol></div>
-<div class="paragraph"><p>The command refuses to process new mailboxes while the <tt>.git/rebase-apply</tt>
-directory exists, so if you decide to start over from scratch,
-run <tt>rm -f -r .git/rebase-apply</tt> before running the command with mailbox
+<div class="paragraph"><p>The command refuses to process new mailboxes until the current
+operation is finished, so if you decide to start over from scratch,
+run <tt>git am --abort</tt> before running the command with mailbox
names.</p></div>
<div class="paragraph"><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
@@ -741,7 +741,7 @@ errors in the "From:" lines).</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:13 UTC
+Last updated 2011-03-23 00:05:17 UTC
</div>
</div>
</body>
|