diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
| commit | 92d80370646a0ce43b0c769027492b3c891090aa (patch) | |
| tree | cee7315334fee3145cb4badcc7a400e3e763fbac /git-am.txt | |
| parent | 48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff) | |
| download | git-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz | |
Autogenerated HTML docs for v2.9.1-273-g79ed4
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 6348c29fe..12879e402 100644 --- a/git-am.txt +++ b/git-am.txt @@ -199,12 +199,12 @@ When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways: -. skip the current patch by re-running the command with the '--skip' +. skip the current patch by re-running the command with the `--skip` option. . hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should - have produced. Then run the command with the '--continue' option. + have produced. Then run the command with the `--continue` option. The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, |