From ed0a7f5cdb1082be3be87fb5e17e0f459ecf0a1e Mon Sep 17 00:00:00 2001 From: Jakob Landbo Date: Mon, 23 Sep 2019 21:59:25 +0200 Subject: [PATCH] completions/git: Added autostash option to rebase --- share/completions/git.fish | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/completions/git.fish b/share/completions/git.fish index 01f1b3049..acc4ebce7 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -1429,6 +1429,8 @@ complete -f -c git -n '__fish_git_using_command rebase' -s r -l rebase-merges -a 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' +complete -f -c git -n '__fish_git_using_command rebase' -l autostash -d 'Before starting rebase, stash local changes, and apply stash when done' +complete -f -c git -n '__fish_git_using_command rebase' -l no-autostash -d 'Do not stash local changes before starting rebase' complete -f -c git -n '__fish_git_using_command rebase' -l no-ff -d 'No fast-forward' # This actually takes script for $SHELL, but completing that is... complicated. complete -r -c git -n '__fish_git_using_command rebase' -l exec -d 'Execute shellscript'