Merge branches 'lh/submodules' and 'pb/am'
authorJunio C Hamano <junkio@cox.net>
Sun, 3 Jun 2007 02:04:54 +0000 (19:04 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 3 Jun 2007 02:04:54 +0000 (19:04 -0700)
* lh/submodules:
  Add basic test-script for git-submodule
  Add git-submodule command

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

1  2  3 
.gitignore
Documentation/cmd-list.perl
Documentation/git-am.txt
Makefile

diff --cc .gitignore
Simple merge
Simple merge
Simple merge
diff --cc 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 \