bash: Add completion for gitk --merge
authorRichard Quirk <richard.quirk@gmail.com>
Sun, 27 Apr 2008 15:35:10 +0000 (17:35 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Apr 2008 04:38:22 +0000 (21:38 -0700)
commit07ba53f724b95a817f957b8e943c9e4f545a0949
treee2aff2295122b87eb5878adf173b0e9c016f1063
parent75ecfce39703e15a9f3d812faa4eb039935c8962
bash: Add completion for gitk --merge

Option is only completed when .git/MERGE_HEAD is present.

Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash