diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-02-12 08:08:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-02-12 08:08:08 +0000 |
| commit | b2628b18098c5ac2facedf7b1808f37bd50fa9dc (patch) | |
| tree | 5d37101e2ddc722b3a42902f0fd9de2cf6f76bc8 /git-am.txt | |
| parent | e7c7be3d3137aa0f559466fc7ba937a890b1c1bb (diff) | |
| download | git-htmldocs-b2628b18098c5ac2facedf7b1808f37bd50fa9dc.tar.gz | |
Autogenerated HTML docs for v1.7.0-rc2-31-g618d1
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt index c3e4f12c4..c66c565bb 100644 --- a/git-am.txt +++ b/git-am.txt @@ -15,7 +15,7 @@ SYNOPSIS [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [--reject] [-q | --quiet] [--scissors | --no-scissors] [<mbox> | <Maildir>...] -'git am' (--skip | --resolved | --abort) +'git am' (--continue | --skip | --abort) DESCRIPTION ----------- @@ -107,6 +107,7 @@ default. You can use `--no-utf8` to override this. Skip the current patch. This is only meaningful when restarting an aborted patch. +--continue:: -r:: --resolved:: After a patch failure (e.g. attempting to apply |