From 6e3c87f4c3c4bbe3b3f8f4b26ed05564d3e27d3c Mon Sep 17 00:00:00 2001 From: Collin Styles Date: Sat, 6 Apr 2019 10:04:45 -0700 Subject: [PATCH] Add completions for git-merge-base --- share/completions/git.fish | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/share/completions/git.fish b/share/completions/git.fish index 6293142e7..8c66fdfaf 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -1169,6 +1169,15 @@ complete -f -c git -n '__fish_git_using_command merge' -s no-rerere-autoupdate - complete -f -c git -n '__fish_git_using_command merge' -l abort -d 'Abort the current conflict resolution process' complete -f -c git -n '__fish_git_using_command merge' -l continue -d 'Conclude current conflict resolution process' +### merge-base +complete -f -c git -n '__fish_git_needs_command' -a merge-base -d 'Find as good common ancestors as possible for a merge' +complete -f -c git -n '__fish_git_using_command merge-base' -a '(__fish_git_branches)' +complete -f -c git -n '__fish_git_using_command merge-base' -s a -l all -d 'Output all merge bases for the commits, instead of just one' +complete -f -c git -n '__fish_git_using_command merge-base' -l octopus -d 'Compute the best common ancestors of all supplied commits' +complete -f -c git -n '__fish_git_using_command merge-base' -l independent -d 'Print a minimal subset of the supplied commits with the same ancestors.' +complete -f -c git -n '__fish_git_using_command merge-base' -l is-ancestor -d 'Check if the first commit is an ancestor of the second commit' +complete -f -c git -n '__fish_git_using_command merge-base' -l fork-point -d 'Find the point at which a branch forked from another branch ref' + ### mergetool complete -f -c git -n '__fish_git_needs_command' -a mergetool -d 'Run merge conflict resolution tools to resolve merge conflicts'