Merge branch 'pt/pull-optparse' into next
commite252b4c567168f50756d8c213a5e3ab839111fcf
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 17:36:57 +0000 (11 10:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 17:36:57 +0000 (11 10:36 -0700)
tree8a93fd941fac1f6946187bd2fd3654d5bcbbe85e
parentb4998e2c1cb1c24d17e1a57b843061f51715d990
parente3b601da2af53cbb9a63e59113d524a8d946ea12
Merge branch 'pt/pull-optparse' into next

"git pull" has become more aware of the options meant for
underlying "git fetch" and then learned to use parse-options
parser.

* pt/pull-optparse:
  pull: use git-rev-parse --parseopt for option parsing
  pull: handle git-fetch's options as well