Merge branch 'tb/complete-describe' into maint

gitster · gitster · commit 3087feaf98d7 · 2017-10-18T14:19:14.000+09:00
Docfix.

* tb/complete-describe:
  completion: add --broken and --dirty to describe
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1385,7 +1385,7 @@ _git_describe ()
 		__gitcomp "
 			--all --tags --contains --abbrev= --candidates=
 			--exact-match --debug --long --match --always --first-parent
-			--exclude
+			--exclude --dirty --broken
 			"
 		return
 	esac

Original file line number	Diff line number	Diff line change
`@@ -1385,7 +1385,7 @@ _git_describe ()`
`1385`	`1385`	`__gitcomp "`
`1386`	`1386`	`--all --tags --contains --abbrev= --candidates=`
`1387`	`1387`	`--exact-match --debug --long --match --always --first-parent`
`1388`		`- --exclude`
	`1388`	`+ --exclude --dirty --broken`
`1389`	`1389`	`"`
`1390`	`1390`	`return`
`1391`	`1391`	`esac`