diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-14 11:16:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-14 19:26:43 (GMT) |
| commit | 65ed8ff376c4fdd8dd560b3ddbf7d6cd771f860e (patch) | |
| tree | 18c3c16a542f5b8e86e201e901ed081c146d3028 /Documentation/git-am.txt | |
| parent | b2e45c695d09f6a31ce09347ae0a5d2cdfe9dd4e (diff) | |
| download | git-65ed8ff376c4fdd8dd560b3ddbf7d6cd771f860e.zip git-65ed8ff376c4fdd8dd560b3ddbf7d6cd771f860e.tar.gz git-65ed8ff376c4fdd8dd560b3ddbf7d6cd771f860e.tar.bz2 | |
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/git-am.txt')
| -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 12879e4..460662e 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 ---------- |