diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-21 04:33:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-21 04:33:46 +0000 |
| commit | 5ba2c22cf94a8ecb23dfd14fab77cc9e4166653f (patch) | |
| tree | 4e7b33c34b04773b352d607bb0ab8a7141deaa29 /git-am.txt | |
| parent | 915cd9bb00e770c8b6862d4d79a192d45605e1ca (diff) | |
| download | git-htmldocs-5ba2c22cf94a8ecb23dfd14fab77cc9e4166653f.tar.gz | |
Autogenerated HTML docs for v1.6.0-rc0
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt index 2d7f16259..e010a1649 100644 --- a/git-am.txt +++ b/git-am.txt @@ -13,7 +13,7 @@ SYNOPSIS [--3way] [--interactive] [--binary] [--whitespace=<option>] [-C<n>] [-p<n>] [<mbox> | <Maildir>...] -'git am' (--skip | --resolved) +'git am' (--skip | --resolved | --abort) DESCRIPTION ----------- @@ -99,6 +99,9 @@ default. You could use `--no-utf8` to override this. or `--skip` to handle the failure. This is solely for internal use between 'git-rebase' and 'git-am'. +--abort:: + Restore the original branch and abort the patching operation. + DISCUSSION ---------- |