mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sg/completion'

Browse Source 
* sg/completion:
  completion: unite --format and --pretty for 'log' and 'show'
  completion: unite --reuse-message and --reedit-message for 'notes'
This commit is contained in:
Junio C Hamano
2011-10-17 21:37:13 -07:00
parent e22bb14d80 e67d71e559
commit 6e97fccf0c
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/completion/git-completion.bash
View File

@ -1553,14 +1553,9 @@ _git_log ()
merge="--merge" merge="--merge"
fi fi
case "$cur" in case "$cur" in
--pretty=*) --pretty=*|--format=*)
__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
" "" "${cur##--pretty=}" " "" "${cur#*=}"
return
;;
--format=*)
__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
" "" "${cur##--format=}"
return return
;; ;;
--date=*) --date=*)
@ -1668,11 +1663,9 @@ _git_notes ()
;; ;;
esac esac
;; ;;
add,--reuse-message=*|append,--reuse-message=*) add,--reuse-message=*|append,--reuse-message=*|\
__gitcomp "$(__git_refs)" "" "${cur##--reuse-message=}"
;;
add,--reedit-message=*|append,--reedit-message=*) add,--reedit-message=*|append,--reedit-message=*)
__gitcomp "$(__git_refs)" "" "${cur##--reedit-message=}" __gitcomp "$(__git_refs)" "" "${cur#*=}"
;; ;;
add,--*|append,--*) add,--*|append,--*)
__gitcomp '--file= --message= --reedit-message= __gitcomp '--file= --message= --reedit-message=
@ -2367,14 +2360,9 @@ _git_show ()
__git_has_doubledash && return __git_has_doubledash && return
case "$cur" in case "$cur" in
--pretty=*) --pretty=*|--format=*)
__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
" "" "${cur##--pretty=}" " "" "${cur#*=}"
return
;;
--format=*)
__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
" "" "${cur##--format=}"
return return
;; ;;
--*) --*)