Merge branch 'mc/git-p4-prepare-p4-only'
commiteb5398a89122e4345b1fd3cab4f5630290bb3d0e
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:38:57 +0000 (6 11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:38:57 +0000 (6 11:38 -0700)
treecb9932fff1eb1f41494568d8579e5bc146aa4379
parent3784ba310fbb14ca96d7faeeefad1d8985c5de86
parentb4073bb387ef303c9ac3c044f46d6a8ae6e190f0
Merge branch 'mc/git-p4-prepare-p4-only'

* mc/git-p4-prepare-p4-only:
  git-p4: Do not include diff in spec file when just preparing p4