Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 26 May 2006 23:36:20 +0000 (16:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 26 May 2006 23:36:20 +0000 (16:36 -0700)
commit2a0a1398ff3db6762076ebd071559c36b9414217
treebc95a9df52973e909359a921f92b33c1bd6185a1
parent3c38f60c339839869f97448fd7a27551f97cec12
parentb931aa5a48f9fb3c26a565d5f19866923f13b692
Merge branch 'master' into next

* master:
  Call builtin ls-tree in git-cat-file -p
  built-in format-patch: various fixups.
  Add instructions to commit template.
git-commit.sh