Code

Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix-rename-leak' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 23 Feb 2006 03:46:59 +0000 (19:46 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 23 Feb 2006 03:46:59 +0000 (19:46 -0800)
commit63c2fcefd8b786ebe99d0beaa1ca3590cdc24609
tree135b4a0294c141abd8678935fe1e8c761152b9e5
parentf6b39fe779bc72d49aa30936c6371d76401fc753
parentbd2afde8a38b97391b22afebf15c583fb0fffacb
parent744633cbf23d3ed505f96ffc212b30c96b79fb90
parent09a5d72d8e8308fa5505e8c5d4715c0b6a5eabcb
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
git-clone.sh
git-merge.sh
read-tree.c
sha1_file.c