git.tremily.us Git - git.git/commit

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4bc7083 88961ef 59c8e2c)

author	Junio C Hamano <junkio@cox.net>
	Sun, 3 Jun 2007 02:04:54 +0000 (19:04 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Sun, 3 Jun 2007 02:04:54 +0000 (19:04 -0700)
commit	1a8b76912e6ccef6bec3531eec30a0693bc25ae7
tree	0a94b441b8a3d174ce42c100cda67cab42288db0	tree \| snapshot
parent	4bc708347e2b94564d9ec5e0e3a2ab0e3d6b2fd9	commit \| diff
parent	88961ef2589433044365213fab98de081a1ce70f	commit \| diff
parent	59c8e2cb2aee2e4eb75007602b264bc4e7928bc0	commit \| diff

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

.gitignore	diff1 \|	diff2 \|	diff3 \|	blob \| history
Documentation/cmd-list.perl	diff1 \|	diff2 \|	diff3 \|	blob \| history
Documentation/git-am.txt	diff1 \|	diff2 \|	diff3 \|	blob \| history
Makefile	diff1 \|	diff2 \|	diff3 \|	blob \| history

Git—the stupid content tracker