summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2009-07-13 17:11:45 +0200
committerJunio C Hamano <gitster@pobox.com>2009-07-13 11:09:51 -0700
commit4fe1a61973c82c459ac0a25cb5342d00d347dfd9 (patch)
tree5f1264ac4d4660a637d9f92ec4d17e0d6f1587fa
parent2657420d9ecee5c68f300cdabdf2bec7e76a2d05 (diff)
downloadgit-4fe1a61973c82c459ac0a25cb5342d00d347dfd9.tar.gz
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>
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 9c488646d0..887731e830 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=