bash completion: Add '--merge' long option for 'git log'

lmarlow · gitster · commit 5a13c8f6f7ef · 2008-08-14T17:49:12.000-07:00
Signed-off-by: Lee Marlow &lt;lee.marlow@gmail.com&gt;
Acked-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -972,6 +972,7 @@ _git_log ()
 			--decorate --diff-filter=
 			--color-words --walk-reflogs
 			--parents --children --full-history
+			--merge
 			"
 		return
 		;;

Original file line number	Diff line number	Diff line change
`@@ -972,6 +972,7 @@ _git_log ()`
`972`	`972`	`--decorate --diff-filter=`
`973`	`973`	`--color-words --walk-reflogs`
`974`	`974`	`--parents --children --full-history`
	`975`	`+ --merge`
`975`	`976`	`"`
`976`	`977`	`return`
`977`	`978`	`;;`