diff options
| author |  Fabian Homborg <FHomborg@gmail.com> | 2015-12-09 16:41:34 +0100 |
|---|---|---|
| committer | Fabian Homborg <FHomborg@gmail.com> | 2015-12-09 16:41:34 +0100 |
| commit | 0212314479b12b49b7149db0aa17330e94d7c4e4 (patch) | |
| tree | 9f21d7bea0c6d2d544953d41c8001b8fe59faf17 /share | |
| parent | 16c34b387ffd0e9e8340b065959d4b6f0cf4f6dc (diff) | |
| parent | a8837f537f9e647f5c36e2cc26fa650079298225 (diff) | |
Merge pull request #2586 from mrshu/mrshu/add-git-cherry-pick-options
git: Add more options to `git cherry-pick`
Diffstat (limited to 'share')
| -rw-r--r-- | share/completions/git.fish | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/share/completions/git.fish b/share/completions/git.fish index 402722ff..42d37d27 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -284,7 +284,11 @@ complete -f -c git -n '__fish_git_using_command branch' -l no-merged -d 'List br complete -f -c git -n '__fish_git_needs_command' -a cherry-pick -d 'Apply the change introduced by an existing commit' complete -f -c git -n '__fish_git_using_command cherry-pick' -a '(__fish_git_branches)' -d 'Branch' complete -f -c git -n '__fish_git_using_command cherry-pick' -a '(__fish_git_unique_remote_branches)' -d 'Remote branch' -# TODO options +complete -f -c git -n '__fish_git_using_command cherry-pick' -s e -l edit -d 'Edit the commit message prior to committing' +complete -f -c git -n '__fish_git_using_command cherry-pick' -s x -d 'Append info in generated commit on the origin of the cherry-picked change' +complete -f -c git -n '__fish_git_using_command cherry-pick' -s n -l no-commit -d 'Apply changes without making any commit' +complete -f -c git -n '__fish_git_using_command cherry-pick' -s s -l signoff -d 'Add Signed-off-by line to the commit message' +complete -f -c git -n '__fish_git_using_command cherry-pick' -l ff -d 'Fast-forward if possible' ### clone complete -f -c git -n '__fish_git_needs_command' -a clone -d 'Clone a repository into a new directory' |