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

gitster · gitster · commit 5639786f3017 · 2012-02-16T12:33:46.000-08:00
* 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
@@ -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
 			"
 		;;
 	*)

Original file line number	Diff line number	Diff line change
`@@ -1152,7 +1152,7 @@ _git_branch ()`
`1152`	`1152`	`__gitcomp "`
`1153`	`1153`	`--color --no-color --verbose --abbrev= --no-abbrev`
`1154`	`1154`	`--track --no-track --contains --merged --no-merged`
`1155`		`- --set-upstream`
	`1155`	`+ --set-upstream --edit-description`
`1156`	`1156`	`"`
`1157`	`1157`	`;;`
`1158`	`1158`	`*)`