summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-08-27 04:45:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-27 21:47:09 (GMT)
commitb1b16bba966b919c0ddb57338c5745ea8b288eb5 (patch)
treedf7960482deabccb881a96088436fb03b796941e /contrib
parentdeaa65a7545f2970167e32db3ff5f91b392f0517 (diff)
downloadgit-b1b16bba966b919c0ddb57338c5745ea8b288eb5.zip
git-b1b16bba966b919c0ddb57338c5745ea8b288eb5.tar.gz
git-b1b16bba966b919c0ddb57338c5745ea8b288eb5.tar.bz2
completion: add --skip for cherry-pick and revert
Even though `--skip` is a valid command-line option for cherry-pick and revert while they are in progress, it is not completed. Add this missing option to the completion script. Signed-off-by: Denton Liu <liu.denton@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 a7d3f58..b465141 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1361,7 +1361,7 @@ _git_checkout ()
esac
}
-__git_sequencer_inprogress_options="--continue --quit --abort"
+__git_sequencer_inprogress_options="--continue --quit --abort --skip"
__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options