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>
This commit is contained in:
Lee Marlow 2008-08-14 16:41:11 -06:00 committed by Junio C Hamano
parent b4c72162f6
commit 5a13c8f6f7

View file

@ -972,6 +972,7 @@ _git_log ()
--decorate --diff-filter= --decorate --diff-filter=
--color-words --walk-reflogs --color-words --walk-reflogs
--parents --children --full-history --parents --children --full-history
--merge
" "
return return
;; ;;