summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-02-14 11:16:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-14 19:26:43 (GMT)
commit65ed8ff376c4fdd8dd560b3ddbf7d6cd771f860e (patch)
tree18c3c16a542f5b8e86e201e901ed081c146d3028 /contrib
parentb2e45c695d09f6a31ce09347ae0a5d2cdfe9dd4e (diff)
downloadgit-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 'contrib')
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 88813e9..c7d5c7a 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1077,7 +1077,7 @@ _git_am ()
{
__git_find_repo_path
if [ -d "$__git_repo_path"/rebase-apply ]; then
- __gitcomp "--skip --continue --resolved --abort"
+ __gitcomp "--skip --continue --resolved --abort --quit"
return
fi
case "$cur" in