Thomas Rast bf3c20f6e8 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>		2009-02-18 10:41:45 -08:00
..
git-completion.bash	bash completion: only show 'log --merge' if merging	2009-02-18 10:41:45 -08:00