From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 18:46:12 +0000 (-0700)
Subject: Merge branch 'jk/complete-merge-pull' into maint
X-Git-Tag: v2.0.1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff7e96b78f3ad9db61fbdfdeaf7b71f254f76310;p=thirdparty%2Fgit.git

Merge branch 'jk/complete-merge-pull' into maint

The completion scripts (in contrib/) 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
---

ff7e96b78f3ad9db61fbdfdeaf7b71f254f76310