diff options
| author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-07-16 19:39:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-19 15:26:28 -0700 |
| commit | 3e5057a8b4499f7b000cd465a3adf6ef22b89f2a (patch) | |
| tree | e8c00bba661904dd95375a1cf05c8213f69883ae /Documentation | |
| parent | fcab40a389e99786a8276108cdbc1cda8caf502f (diff) | |
| download | git-3e5057a8b4499f7b000cd465a3adf6ef22b89f2a.tar.gz git-3e5057a8b4499f7b000cd465a3adf6ef22b89f2a.tar.xz | |
git am --abort
After failing to apply patches in the middle of a series, "git am --abort"
lets you go back to the original commit.
[jc: doc/help update from Olivier, and fixups for "am -3" squashed in]
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Olivier Marin <dkr@freesurf.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -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 2d7f16259..e010a1649 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 ---------- |