diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-28 13:37:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-28 13:37:52 -0800 |
| commit | c22c624a9de3576d6e66f81c3a1edc6dfcfb08bb (patch) | |
| tree | 0f8bdd53d9cad7b369c0e120cdff23bff40bdd27 /Documentation | |
| parent | Fifth batch for 2.17 (diff) | |
| parent | am: support --quit (diff) | |
| download | tgif-c22c624a9de3576d6e66f81c3a1edc6dfcfb08bb.tar.xz | |
Merge branch 'nd/am-quit'
"git am" has learned the "--quit" option, in addition to the existing
"--abort" option; having the pair mirrors a few other commands like
"rebase" and "cherry-pick".
* nd/am-quit:
am: support --quit
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 12879e4029..460662e4b9 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -16,7 +16,7 @@ SYNOPSIS [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>] [(<mbox> | <Maildir>)...] -'git am' (--continue | --skip | --abort) +'git am' (--continue | --skip | --abort | --quit) DESCRIPTION ----------- @@ -167,6 +167,10 @@ default. You can use `--no-utf8` to override this. --abort:: Restore the original branch and abort the patching operation. +--quit:: + Abort the patching operation but keep HEAD and the index + untouched. + DISCUSSION ---------- |