| commit | 67f1fe5f08d3f6146cf13f8a65ceeab1509581a8 | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Mon, 16 Feb 2009 16:34:57 +0000 (16 17:34 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Mar 2009 16:06:48 +0000 (30 09:06 -0700) | ||
| tree | c58c0f46a91c8f58cab2f3bd58ab5a9ed2268d7b | treesnapshot (tar.gz zip) |
| parent | abfd5fa8725ef1a0ffddb0d1a768cbbfbc74a972 | commitdiff |
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>
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 | diffblobblamehistory |