Added missing completions for show-branch and merge-base.
The show-branch and merge-base commands were partially supported when it came to bash completions as they were only specified in one form another. Now we specify them in both forms. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn O. Pearce committed
Nov 5, 2006 at 06:20 UTC
144d33dec97405889e302c2391300ee04aad7714
1 file changed
+4
contrib/completion/git-completion.bash
+4
@@ -309,6 +309,7 @@ _git ()
309
log) _git_log ;;
310
ls-remote) _git_ls_remote ;;
311
ls-tree) _git_ls_tree ;;
312
+ merge-base) _git_merge_base ;;
313
pull) _git_pull ;;
314
push) _git_push ;;
315
reset) _git_reset ;;
@@ -342,12 +343,14 @@ complete -o default -o nospace -F _git_pull git-pull
343
complete -o default -o nospace -F _git_push git-push
344
complete -o default -F _git_reset git-reset
345
complete -o default -F _git_show git-show
346
+complete -o default -o nospace -F _git_log git-show-branch
347
complete -o default -o nospace -F _git_log git-whatchanged
348
349
# The following are necessary only for Cygwin, and only are needed
350
# when the user has tab-completed the executable name and consequently
351
# included the '.exe' suffix.
352
#
353
+complete -o default -o nospace -F _git git.exe
354
complete -o default -F _git_branch git-branch.exe
355
complete -o default -o nospace -F _git_cat_file git-cat-file.exe
356
complete -o default -o nospace -F _git_diff git-diff.exe
@@ -356,4 +359,5 @@ complete -o default -o nospace -F _git_log git-log.exe
359
complete -o default -o nospace -F _git_ls_tree git-ls-tree.exe
360
complete -o default -F _git_merge_base git-merge-base.exe
361
complete -o default -o nospace -F _git_push git-push.exe
362
+complete -o default -o nospace -F _git_log git-show-branch.exe
363
complete -o default -o nospace -F _git_log git-whatchanged.exe