diff options
| author |  Lee Marlow <lee.marlow@gmail.com> | 2008-08-14 16:41:11 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-08-14 17:49:12 -0700 |
| commit | 5a13c8f6f7ef7463ddaa3dd7144bf66af4fcd9be (patch) | |
| tree | dc8099aef712240eba61db1b6745d13698784ad3 | |
| parent | bash completion: Add completion for 'git mergetool' (diff) | |
| download | tgif-5a13c8f6f7ef7463ddaa3dd7144bf66af4fcd9be.tar.xz | |
bash completion: Add '--merge' long option for 'git log'
Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/completion/git-completion.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 2f8036d1d9..c0bf7aade6 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -972,6 +972,7 @@ _git_log () --decorate --diff-filter= --color-words --walk-reflogs --parents --children --full-history + --merge " return ;; |