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)
* rs/cherry:
  Make git-cherry handle root trees
  Built-in cherry

1  2 
Makefile
builtin.h
git.c

diff --cc 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 \
diff --cc builtin.h
Simple merge
diff --cc git.c
Simple merge