git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c65d3b 749b668)
Merge branch 'cl/p4-use-diff-tree'
authorJunio C Hamano <redacted>
Wed, 7 May 2014 21:39:29 +0000 (14:39 -0700)
committerJunio C Hamano <redacted>
Wed, 7 May 2014 21:39:29 +0000 (14:39 -0700)
Fixes a regression in 1.9.0 with an obviously correct single-liner.

* cl/p4-use-diff-tree:
  git-p4: format-patch to diff-tree change breaks binary patches

1  2 
git-p4.py patch | diff1 | diff2 | blob | history

diff --cc git-p4.py
Simple merge
git clone https://git.99rst.org/PROJECT