Sync with maint

2012-02-16 14:27:20 -08:00
parent 0364bb135e d1ba7a4cb7
commit b0d66b5110
3 changed files with 31 additions and 4 deletions
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@ -1137,7 +1137,7 @@ _git_branch ()
 		__gitcomp "
 			--color --no-color --verbose --abbrev= --no-abbrev
 			--track --no-track --contains --merged --no-merged
-			--set-upstream --edit-description
+			--set-upstream --edit-description --list
 			"
 		;;
 	*)