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>
This commit is contained in:
SZEDER Gábor 2009-07-13 17:11:45 +02:00 committed by Junio C Hamano
parent 2657420d9e
commit 4fe1a61973

View File

@ -1114,7 +1114,7 @@ _git_ls_tree ()
__git_log_common_options=" __git_log_common_options="
--not --all --not --all
--branches --tags --remotes --branches --tags --remotes
--first-parent --no-merges --first-parent --merges --no-merges
--max-count= --max-count=
--max-age= --since= --after= --max-age= --since= --after=
--min-age= --until= --before= --min-age= --until= --before=