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

* rt/completion-branch-edit-desc: completion: --edit-description option for git-branch
2012-02-16 12:33:46 -08:00 · 2012-02-16 12:33:46 -08:00 · 5639786f30
parent 90020e3bcd 48c07d8684
commit 5639786f30
1 changed files with 1 additions and 1 deletions
--- 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
 			"
 		;;
 	*)