Merge branch 'rs/cherry'

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

diff --cc Makefile
index 40e2a680f050f6f7623f2e49066a8897f4b64cbd,2b53747df13cf74e4fef3596ea1f42dba52c2e18..1cc9f586d6d239273b72c4500b35e6c437debe6a
--- 1/Makefile
--- 2/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