From: SZEDER Gábor <szeder@ira.uka.de>
Date: Mon, 13 Jul 2009 15:11:45 +0000 (+0200)
Subject: bash: add '--merges' to common 'git log' options
X-Git-Tag: v1.6.4-rc1~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4fe1a61973c82c459ac0a25cb5342d00d347dfd9;p=git.git

bash: add '--merges' to common 'git log' options

... so it's available for git log, shortlog and gitk.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 9c488646d..887731e83 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1114,7 +1114,7 @@ _git_ls_tree ()
 __git_log_common_options="
 	--not --all
 	--branches --tags --remotes
-	--first-parent --no-merges
+	--first-parent --merges --no-merges
 	--max-count=
 	--max-age= --since= --after=
 	--min-age= --until= --before=