From: SZEDER Gábor Date: Mon, 13 Jul 2009 15:11:45 GMT Subject: [PATCH 2/2] bash: add '--merges' to common 'git log' options Message-ID: <48eaed566b8db43b6552893da52d76649d6c7f77.1247497864.git.szeder@ira.uka.de> In-Reply-To: <0f4a962e946f68ec0d7a4c2e568fb3e5ae2a10bc.1247497864.git.szeder@ira.uka.de> ... so it's available for git log, shortlog and gitk. Signed-off-by: SZEDER Gábor --- contrib/completion/git-completion.bash | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 90edc8c..bc2d8b4 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= -- 1.6.4.rc0.78.g75597