From: Lee Marlow <lee.marlow@gmail.com>
Date: Thu, 14 Aug 2008 22:41:11 +0000 (-0600)
Subject: bash completion: Add '--merge' long option for 'git log'
X-Git-Tag: v1.6.0~14
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5a13c8f6f7ef7463ddaa3dd7144bf66af4fcd9be;p=git-core%2Fgit.git

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

Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2f8036d1d..c0bf7aade 100755
--- 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
 		;;