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>
SZEDER Gábor committed
Jul 13, 2009 at 17:11 UTC
4fe1a61973c82c459ac0a25cb5342d00d347dfd9
1 file changed
+1
-1
contrib/completion/git-completion.bash
+1
-1
@@ -1114,7 +1114,7 @@ _git_ls_tree ()
1114
__git_log_common_options="
1115
--not --all
1116
--branches --tags --remotes
1117
- --first-parent --no-merges
1117
+ --first-parent --merges --no-merges
1118
--max-count=
1119
--max-age= --since= --after=
1120
--min-age= --until= --before=