From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Feb 2012 20:33:46 +0000 (-0800)
Subject: Merge branch 'rt/completion-branch-edit-desc' into maint
X-Git-Tag: v1.7.9.2~31
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5639786f3017711d2e38d2a02714afd0c30d7a37?ds=inline;hp=-c

Merge branch 'rt/completion-branch-edit-desc' into maint

* rt/completion-branch-edit-desc:
completion: --edit-description option for git-branch
---

5639786f3017711d2e38d2a02714afd0c30d7a37
diff --combined contrib/completion/git-completion.bash
index 78be195838,e44eefdf1c..a2965f7c6d
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1152,7 -1152,7 +1152,7 @@@ _git_branch (
  		__gitcomp "
  			--color --no-color --verbose --abbrev= --no-abbrev
  			--track --no-track --contains --merged --no-merged
- 			--set-upstream
+ 			--set-upstream --edit-description
  			"
  		;;
  	*)
@@@ -1622,7 -1622,7 +1622,7 @@@ _git_log (
  
  __git_merge_options="
  	--no-commit --no-stat --log --no-log --squash --strategy
 -	--commit --stat --no-squash --ff --no-ff --ff-only
 +	--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
  "
  
  _git_merge ()