summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-09-30 04:19:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-09-30 04:19:30 (GMT)
commit21db12c9ea572a34bd9d4388135b1a9553c28133 (patch)
tree3772546518d78bf83147bcc9f4e713e75596e492 /contrib
parentd693345518e9d5145902ec001a364ccdec8e148b (diff)
parent86ae43da6a6edbe7fbd9226ef316b894aef9da21 (diff)
downloadgit-21db12c9ea572a34bd9d4388135b1a9553c28133.zip
git-21db12c9ea572a34bd9d4388135b1a9553c28133.tar.gz
git-21db12c9ea572a34bd9d4388135b1a9553c28133.tar.bz2
Merge branch 'dl/complete-cherry-pick-revert-skip'
The command line completion support (in contrib/) learned about the "--skip" option of "git revert" and "git cherry-pick". * dl/complete-cherry-pick-revert-skip: status: mention --skip for revert and cherry-pick completion: add --skip for cherry-pick and revert completion: merge options for cherry-pick and revert
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash6
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ce7ff0a..6f7b4f9 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1361,7 +1361,9 @@ _git_checkout ()
esac
}
-__git_cherry_pick_inprogress_options="--continue --quit --abort"
+__git_sequencer_inprogress_options="--continue --quit --abort --skip"
+
+__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options
_git_cherry_pick ()
{
@@ -2624,7 +2626,7 @@ _git_restore ()
esac
}
-__git_revert_inprogress_options="--continue --quit --abort"
+__git_revert_inprogress_options=$__git_sequencer_inprogress_options
_git_revert ()
{