[PATCH 2/2] bash completion: Add '--merge' long option for 'git log'

From: Lee Marlow <lee.marlow@gmail.com>
Date: Aug 14, 2008, 22:41 UTC
Message-ID: <1218753671-58099-3-git-send-email-lee.marlow@gmail.com>
In-Reply-To: <1218753671-58099-2-git-send-email-lee.marlow@gmail.com>

Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
---
 contrib/completion/git-completion.bash |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4089670..bdf4f4a 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
 		;;

-- 
1.6.0.rc3.6.ga0653