From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Jun 2014 19:17:53 +0000 (-0700)
Subject: Merge branch 'jk/complete-merge-pull'
X-Git-Tag: v2.1.0-rc0~119
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5cf2c571d08f38b90887d41d5c03376714f0b00d?ds=inline;hp=-c

Merge branch 'jk/complete-merge-pull'

The completion code did not know about quite a few options that are
common between "git merge" and "git pull", and a couple of options
unique to "git merge".

* jk/complete-merge-pull:
completion: add missing options for git-merge
completion: add a note that merge options are shared
---

5cf2c571d08f38b90887d41d5c03376714f0b00d