Merge branch 'jk/complete-merge-base'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:43:55 +0000 (10:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:43:55 +0000 (10:43 -0800)
* jk/complete-merge-base:
completion: handle --[no-]fork-point options to git-rebase
completion: complete merge-base options

1  2 
contrib/completion/git-completion.bash
Simple merge