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?hp=90020e3bcd2108baecc79144319c86ad865c8c5e

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

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

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 78be195838..a2965f7c6d 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -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
 			"
 		;;
 	*)