Added git rebase --rebase-merges[=(rebase-cousins|no-rebase-cousins)] to completion

See https://git-scm.com/docs/git-rebase/2.18.0#git-rebase--r
This commit is contained in:
Sergei Morozov 2019-08-27 11:42:58 -07:00 committed by Fabian Homborg
parent 35b64b0470
commit 753f49dba9

View File

@ -1405,6 +1405,7 @@ complete -f -c git -n '__fish_git_using_command rebase' -l no-verify -d "Don't a
complete -f -c git -n '__fish_git_using_command rebase' -s f -l force-rebase -d 'Force the rebase'
complete -f -c git -n '__fish_git_using_command rebase' -s i -l interactive -d 'Interactive mode'
complete -f -c git -n '__fish_git_using_command rebase' -s p -l preserve-merges -d 'Try to recreate merges'
complete -f -c git -n '__fish_git_using_command rebase' -s r -l rebase-merges -a 'rebase-cousins no-rebase-cousins' -d 'Preserve branch structure'
complete -f -c git -n '__fish_git_using_command rebase' -l root -d 'Rebase all reachable commits'
complete -f -c git -n '__fish_git_using_command rebase' -l autosquash -d 'Automatic squashing'
complete -f -c git -n '__fish_git_using_command rebase' -l no-autosquash -d 'No automatic squashing'