Merge branch 'rs/cherry'
authorJunio C Hamano <junkio@cox.net>
Wed, 1 Nov 2006 17:17:37 +0000 (09:17 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 1 Nov 2006 17:17:37 +0000 (09:17 -0800)
commit56532fa147d56057ad4121f5ccea8e254748afdd
treef5536ca0d7ba9ca232ea606ebc6f501d396a4b98
parente0d68cd5d95fc15342db38c211f71efe5bcfbe94
parent2b60356da5369dd60ab26eabaa91d95b6badf209
Merge branch 'rs/cherry'

* rs/cherry:
  Make git-cherry handle root trees
  Built-in cherry
Makefile
builtin.h
git.c