diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-14 18:16:06 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-14 11:26:43 -0800 |
| commit | 65ed8ff376c4fdd8dd560b3ddbf7d6cd771f860e (patch) | |
| tree | 18c3c16a542f5b8e86e201e901ed081c146d3028 /Documentation | |
| parent | Second batch for 2.17 (diff) | |
| download | tgif-65ed8ff376c4fdd8dd560b3ddbf7d6cd771f860e.tar.xz | |
am: support --quit
Among the "in progress" commands, only git-am and git-merge do not
support --quit. Support --quit in git-am too.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 ---------- |