From: Junio C Hamano <junkio@cox.net>
Date: Wed, 1 Nov 2006 17:17:37 +0000 (-0800)
Subject: Merge branch 'rs/cherry'
X-Git-Tag: v1.4.4-rc1~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=56532fa147d56057ad4121f5ccea8e254748afdd;p=git.git

Merge branch 'rs/cherry'

* rs/cherry:
  Make git-cherry handle root trees
  Built-in cherry
---

56532fa147d56057ad4121f5ccea8e254748afdd
diff --cc Makefile
index 40e2a680f,2b53747df..1cc9f586d
--- a/Makefile
+++ b/Makefile
@@@ -158,8 -156,8 +158,8 @@@ BASIC_CFLAGS 
  BASIC_LDFLAGS =
  
  SCRIPT_SH = \
 -	git-bisect.sh git-branch.sh git-checkout.sh \
 +	git-bisect.sh git-checkout.sh \
- 	git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
+ 	git-clean.sh git-clone.sh git-commit.sh \
  	git-fetch.sh \
  	git-ls-remote.sh \
  	git-merge-one-file.sh git-parse-remote.sh \