From 248de41d70b9d52da3fa16b09ad64c7a8a830e27 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 7 Sep 2017 16:24:05 +0200 Subject: [PATCH] Add completions for git checkout --ours/--theirs (#4380) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add completions for git checkout --ours/--theirs * Change description for `git checkout --ours/--theirs´ completions (cherry picked from commit 6145b4a7704994ee5ef4bc4ad2febf404c4a37a2) --- share/completions/git.fish | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/completions/git.fish b/share/completions/git.fish index 4bb54d129..8181958da 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -369,6 +369,8 @@ complete -f -c git -n '__fish_git_using_command checkout' -a '(__fish_git_tags)' complete -f -c git -n '__fish_git_using_command checkout' -a '(__fish_git_modified_files)' --description 'File' complete -f -c git -n '__fish_git_using_command checkout' -s b -d 'Create a new branch' complete -f -c git -n '__fish_git_using_command checkout' -s t -l track -d 'Track a new branch' +complete -f -c git -n '__fish_git_using_command checkout' -l theirs -d 'Keep staged changes' +complete -f -c git -n '__fish_git_using_command checkout' -l ours -d 'Keep unmerged changes' # TODO options ### apply