diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:30 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:30 +0900 |
| commit | 21db12c9ea572a34bd9d4388135b1a9553c28133 (patch) | |
| tree | 3772546518d78bf83147bcc9f4e713e75596e492 /contrib/completion/git-completion.bash | |
| parent | d693345518e9d5145902ec001a364ccdec8e148b (diff) | |
| parent | 86ae43da6a6edbe7fbd9226ef316b894aef9da21 (diff) | |
| download | git-21db12c9ea572a34bd9d4388135b1a9553c28133.tar.xz | |
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/completion/git-completion.bash')
| -rw-r--r-- | contrib/completion/git-completion.bash | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ce7ff0a96d..6f7b4f9607 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 () { |