From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 9 Oct 2008 17:19:51 +0000 (-0700)
Subject: Merge branch 'mw/sendemail'
X-Git-Tag: v1.6.1-rc1~164
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d5c527448db30be55553e0b125015e8d444f8dbc?ds=inline;hp=-c

Merge branch 'mw/sendemail'

* mw/sendemail:
bash completion: Add --[no-]validate to "git send-email"
send-email: signedoffcc -> signedoffbycc, but handle both
Docs: send-email: Create logical groupings for man text
Docs: send-email: Create logical groupings for --help text
Docs: send-email: Remove unnecessary config variable description
Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
send-email: change --no-validate to boolean --[no-]validate
Docs: send-email: Man page option ordering
Docs: send-email usage text much sexier
Docs: send-email's usage text and man page mention same options
---

d5c527448db30be55553e0b125015e8d444f8dbc
diff --combined contrib/completion/git-completion.bash
index 15073d4c9f,7284c3b5a8..d192927c20
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -785,9 -785,14 +785,9 @@@ _git_fetch (
  {
  	local cur="${COMP_WORDS[COMP_CWORD]}"
  
 -	case "${COMP_WORDS[0]},$COMP_CWORD" in
 -	git-fetch*,1)
 +	if [ "$COMP_CWORD" = 2 ]; then
  		__gitcomp "$(__git_remotes)"
 -		;;
 -	git,2)
 -		__gitcomp "$(__git_remotes)"
 -		;;
 -	*)
 +	else
  		case "$cur" in
  		*:*)
  			local pfx=""
@@@ -806,7 -811,8 +806,7 @@@
  			__gitcomp "$(__git_refs2 "$remote")"
  			;;
  		esac
 -		;;
 -	esac
 +	fi
  }
  
  _git_format_patch ()
@@@ -1043,25 -1049,36 +1043,25 @@@ _git_pull (
  {
  	local cur="${COMP_WORDS[COMP_CWORD]}"
  
 -	case "${COMP_WORDS[0]},$COMP_CWORD" in
 -	git-pull*,1)
 -		__gitcomp "$(__git_remotes)"
 -		;;
 -	git,2)
 +	if [ "$COMP_CWORD" = 2 ]; then
  		__gitcomp "$(__git_remotes)"
 -		;;
 -	*)
 +	else
  		local remote
  		case "${COMP_WORDS[0]}" in
  		git-pull)  remote="${COMP_WORDS[1]}" ;;
  		git)       remote="${COMP_WORDS[2]}" ;;
  		esac
  		__gitcomp "$(__git_refs "$remote")"
 -		;;
 -	esac
 +	fi
  }
  
  _git_push ()
  {
  	local cur="${COMP_WORDS[COMP_CWORD]}"
  
 -	case "${COMP_WORDS[0]},$COMP_CWORD" in
 -	git-push*,1)
 -		__gitcomp "$(__git_remotes)"
 -		;;
 -	git,2)
 +	if [ "$COMP_CWORD" = 2 ]; then
  		__gitcomp "$(__git_remotes)"
 -		;;
 -	*)
 +	else
  		case "$cur" in
  		*:*)
  			local remote
@@@ -1085,7 -1102,8 +1085,7 @@@
  			__gitcomp "$(__git_refs)"
  			;;
  		esac
 -		;;
 -	esac
 +	fi
  }
  
  _git_rebase ()
@@@ -1123,7 -1141,8 +1123,8 @@@ _git_send_email (
  			--no-suppress-from --no-thread --quiet
  			--signed-off-by-cc --smtp-pass --smtp-server
  			--smtp-server-port --smtp-ssl --smtp-user --subject
- 			--suppress-cc --suppress-from --thread --to"
+ 			--suppress-cc --suppress-from --thread --to
+ 			--validate --no-validate"
  		return
  		;;
  	esac