From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Oct 2011 04:37:13 +0000 (-0700)
Subject: Merge branch 'sg/completion'
X-Git-Tag: v1.7.8-rc0~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e97fccf0c77b15c86e25558d69ce54422ebcf92;p=git.git

Merge branch 'sg/completion'

* sg/completion:
  completion: unite --format and --pretty for 'log' and 'show'
  completion: unite --reuse-message and --reedit-message for 'notes'
---

6e97fccf0c77b15c86e25558d69ce54422ebcf92
diff --cc contrib/completion/git-completion.bash
index 344119b1b,5c649c6f4..888e8e10c
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1552,15 -1601,12 +1552,10 @@@ _git_log (
  	if [ -f "$g/MERGE_HEAD" ]; then
  		merge="--merge"
  	fi
 -	local cur
 -	_get_comp_words_by_ref -n =: cur
  	case "$cur" in
- 	--pretty=*)
+ 	--pretty=*|--format=*)
  		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
- 			" "" "${cur##--pretty=}"
- 		return
- 		;;
- 	--format=*)
- 		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
- 			" "" "${cur##--format=}"
+ 			" "" "${cur#*=}"
  		return
  		;;
  	--date=*)
@@@ -2366,15 -2448,12 +2359,10 @@@ _git_show (
  {
  	__git_has_doubledash && return
  
 -	local cur
 -	_get_comp_words_by_ref -n =: cur
  	case "$cur" in
- 	--pretty=*)
- 		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
- 			" "" "${cur##--pretty=}"
- 		return
- 		;;
- 	--format=*)
+ 	--pretty=*|--format=*)
  		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
- 			" "" "${cur##--format=}"
+ 			" "" "${cur#*=}"
  		return
  		;;
  	--*)