diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2009-07-13 15:11:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-13 18:09:51 (GMT) |
| commit | 4fe1a61973c82c459ac0a25cb5342d00d347dfd9 (patch) | |
| tree | 5f1264ac4d4660a637d9f92ec4d17e0d6f1587fa /contrib | |
| parent | 2657420d9ecee5c68f300cdabdf2bec7e76a2d05 (diff) | |
| download | git-4fe1a61973c82c459ac0a25cb5342d00d347dfd9.zip git-4fe1a61973c82c459ac0a25cb5342d00d347dfd9.tar.gz git-4fe1a61973c82c459ac0a25cb5342d00d347dfd9.tar.bz2 | |
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | 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 9c48864..887731e 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= |