git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Wed, 28 Nov 2012 20:04:32 +0000 (12:04 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 28 Nov 2012 20:04:50 +0000 (12:04 -0800)
commit	2a7f6ffb9168c2e0d1f4ca9c1b63357e431093e9
tree	6f857fe670e7c1c6cfd434233e884ab15cb1d9da	tree \| snapshot
parent	4047fecf714e8ffdc4ae199f9cd3ee2d50b0259c	commit \| diff
parent	6b2bf41e6c1c9742c5ad5b5920f48a7b23aa6a50	commit \| diff

Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint

"git p4" used to try expanding malformed "$keyword$" that spans
across multiple lines.

* 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

RSS Atom

git-p4.py	diff1 \|	diff2 \|	blob \| history
t/t9810-git-p4-rcs.sh	diff1 \|	diff2 \|	blob \| history