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.txt | |
| parent | d2c978f6be36b38127b58af46e28e3ae590b2d3b (diff) | |
| download | git-htmldocs-78f25df845b9b3579ac0c29a415f8282599831d0.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-357-g1ea9
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-am.txt b/git-am.txt index 621b72009..6b1b5af64 100644 --- a/git-am.txt +++ b/git-am.txt @@ -173,9 +173,9 @@ aborts in the middle. You can recover from this in one of two ways: the index file to bring it into a state that the patch should have produced. Then run the command with the '--resolved' option. -The command refuses to process new mailboxes while the `.git/rebase-apply` -directory exists, so if you decide to start over from scratch, -run `rm -f -r .git/rebase-apply` before running the command with mailbox +The command refuses to process new mailboxes until the current +operation is finished, so if you decide to start over from scratch, +run `git am --abort` before running the command with mailbox names. Before any patches are applied, ORIG_HEAD is set to the tip of the |