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.txt | |
| parent | 38ddcce0c19a8eedec7a98bd291f65b2127a82b9 (diff) | |
| download | git-htmldocs-f5a9362a72a5a586926fce49c90c93a75cbad2b5.tar.gz | |
Autogenerated HTML docs for v1.5.6.3-384-gfcab4
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-am.txt b/git-am.txt index 1395c7d98..2d7f16259 100644 --- a/git-am.txt +++ b/git-am.txt @@ -140,9 +140,9 @@ aborts in the middle,. You can recover from this in one of two ways: the index file to bring it in a state that the patch should have produced. Then run the command with '--resolved' option. -The command refuses to process new mailboxes while `.dotest` +The command refuses to process new mailboxes while `.git/rebase` directory exists, so if you decide to start over from scratch, -run `rm -f -r .dotest` before running the command with mailbox +run `rm -f -r .git/rebase` before running the command with mailbox names. Before any patches are applied, ORIG_HEAD is set to the tip of the |