git.octo.it Git - git.git/commit

author	Junio C Hamano <junkio@cox.net>
	Thu, 23 Feb 2006 03:46:59 +0000 (19:46 -0800)
committer	Junio C Hamano <junkio@cox.net>
	Thu, 23 Feb 2006 03:46:59 +0000 (19:46 -0800)
commit	63c2fcefd8b786ebe99d0beaa1ca3590cdc24609
tree	135b4a0294c141abd8678935fe1e8c761152b9e5	tree \| snapshot
parent	f6b39fe779bc72d49aa30936c6371d76401fc753	commit \| diff
parent	bd2afde8a38b97391b22afebf15c583fb0fffacb	commit \| diff
parent	744633cbf23d3ed505f96ffc212b30c96b79fb90	commit \| diff
parent	09a5d72d8e8308fa5505e8c5d4715c0b6a5eabcb	commit \| diff

Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix-rename-leak' into next

* maint:
  Give no terminating LF to error() function.

* jc/fix-co-candy:
  checkout - eye candy.

* jc/fix-rename-leak:
  diffcore-rename: plug memory leak.

commit.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
git-clone.sh	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
git-merge.sh	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
read-tree.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
sha1_file.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history