From: Junio C Hamano <junkio@cox.net>
Date: Sun, 3 Jun 2007 02:04:54 +0000 (-0700)
Subject: Merge branches 'lh/submodules' and 'pb/am'
X-Git-Tag: v1.5.3-rc0~169
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1a8b76912e6ccef6bec3531eec30a0693bc25ae7;p=git.git

Merge branches 'lh/submodules' and 'pb/am'

* lh/submodules:
  Add basic test-script for git-submodule
  Add git-submodule command

* pb/am:
  Remove git-applypatch
  git-applymbox: Remove command
---

1a8b76912e6ccef6bec3531eec30a0693bc25ae7
diff --cc Makefile
index cac0a4a2e,5cf2169ef,4e63a695f..a11ff6054
--- a/Makefile
+++ b/Makefile
@@@@ -206,10 -206,10 -206,10 +206,10 @@@@ SCRIPT_SH = 
   	git-repack.sh git-request-pull.sh git-reset.sh \
   	git-sh-setup.sh \
   	git-tag.sh git-verify-tag.sh \
-- 	git-applymbox.sh git-applypatch.sh git-am.sh \
++ 	git-am.sh \
   	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
   	git-merge-resolve.sh git-merge-ours.sh \
- -	git-lost-found.sh git-quiltimport.sh
+ +	git-lost-found.sh git-quiltimport.sh git-submodule.sh
   
   SCRIPT_PERL = \
   	git-add--interactive.perl \