diff options
author | 2008-07-20 18:00:13 -0700 | |
---|---|---|
committer | 2008-07-20 18:00:13 -0700 | |
commit | 245648dede5e67180ce059a71e3f77a8bb7f52b4 (patch) | |
tree | 91d0038cb057d3e05e5d6094009d8a420163d4db /Documentation/git-am.txt | |
parent | Merge branch 'jc/add-addremove' (diff) | |
parent | git am --abort (diff) | |
download | tgif-245648dede5e67180ce059a71e3f77a8bb7f52b4.tar.xz |
Merge branch 'ns/am-abort'
* ns/am-abort:
git am --abort
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r-- | Documentation/git-am.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 2d7f162594..e010a16493 100644 --- a/Documentation/git-am.txt +++ b/Documentation/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 ---------- |