projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b0c07c8 6b2bf41)
Merge branch 'pw/maint-p4-rcs-expansion-newline'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:34:15 +0000 (10:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:34:15 +0000 (10:34 -0800)
commit077ad4a0f20a4b7288ba001a5bb33742ff56e9fa
treee2878de910572564f9a7fa966a2bb2fdd6c7aa4ctree | snapshot
parentb0c07c8dc4798f1d6cc7bb515ab36f1ae0c58678commit | diff
parent6b2bf41e6c1c9742c5ad5b5920f48a7b23aa6a50commit | diff
Merge branch 'pw/maint-p4-rcs-expansion-newline'

I do not have p4 to play with, but looks obviously correct to me.

* pw/maint-p4-rcs-expansion-newline:
  git p4: RCS expansion should not span newlines
git-p4.py diff1 | diff2 | blob | history
t/t9810-git-p4-rcs.sh diff1 | diff2 | blob | history
Git—the stupid content tracker