git.verplant.org Git - git.git/commit

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6abf5c0 40dad96)

author	Junio C Hamano <junkio@cox.net>
	Sun, 16 Oct 2005 18:55:35 +0000 (11:55 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Sun, 16 Oct 2005 18:55:35 +0000 (11:55 -0700)
commit	29504118f8528f658fd0bfc02d8d78d4c01dc2cc
tree	0412494891ef327fa7070c9fca192ae418e5fe2b	tree \| snapshot
parent	6abf5c0c6fb2ad9bb24444171d306262a8c8f4a2	commit \| diff
parent	40dad96e41fcb96e31bdf11deec3c7bf6261adbe	commit \| diff

Merge branch 'svn' of netz.smurf.noris.de/git/git

[jc: I have my pre-commit hook enabled to catch trailing whitespaces,
and fixed them up while merging.]

Signed-off-by: Junio C Hamano <junkio@cox.net>

Documentation/git-svnimport.txt	\|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
debian/control	diff1 \|	diff2 \|	blob \| history
git-cvsimport.perl	diff1 \|	diff2 \|	blob \| history
git-svnimport.perl	\|	diff2 \|	blob \| history

The core git plumbing