projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: abfd5fa) | patch
bash completion: only show 'log --merge' if merging
authorThomas Rast <trast@student.ethz.ch>
Mon, 16 Feb 2009 16:34:57 +0000 (17:34 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2009 16:06:48 +0000 (09:06 -0700)
commit67f1fe5f08d3f6146cf13f8a65ceeab1509581a8
treec58c0f46a91c8f58cab2f3bd58ab5a9ed2268d7btree | snapshot
parentabfd5fa8725ef1a0ffddb0d1a768cbbfbc74a972commit | diff
bash completion: only show 'log --merge' if merging

The gitk completion only shows --merge if MERGE_HEAD is present.
Do it the same way for git-log completion.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash diff | blob | history
Git—the stupid content tracker