git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fbfdf13 8fee872)
Merge branch 'jk/complete-merge-pull' into maint
authorJunio C Hamano <redacted>
Wed, 25 Jun 2014 18:46:12 +0000 (11:46 -0700)
committerJunio C Hamano <redacted>
Wed, 25 Jun 2014 18:46:12 +0000 (11:46 -0700)
commitff7e96b78f3ad9db61fbdfdeaf7b71f254f76310
tree5931ff763db1eefc6345a4ab54247095f595f2f7tree | snapshot
parentfbfdf13b5c0f168bbb292454d8099ca49dd7dbd6commit | diff
parent8fee8726470bd63db6c396ea6208ea487eaa8fabcommit | diff
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
git clone https://git.99rst.org/PROJECT