Andrew's git / gitweb.git / diff
?
Merge branch 'mc/git-p4-prepare-p4-only'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:38:57 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:38:57 +0000 (11:38 -0700)
* mc/git-p4-prepare-p4-only:
git-p4: Do not include diff in spec file when just preparing p4

Trivial merge