mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/complete-cherry-pick-revert-skip'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2019-09-30 13:19:30 +09:00
parent d693345518 86ae43da6a
commit 21db12c9ea
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/completion/git-completion.bash
View File

@ -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 ()
{