From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 May 2009 08:04:10 +0000 (-0700)
Subject: Merge branch 'jc/mktree' into sb/opt-filename
X-Git-Tag: v1.6.4-rc0~94^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d09e64ac10aab1ae6ae1ac9cce7a6ebb43f2e50;p=git.git

Merge branch 'jc/mktree' into sb/opt-filename

* jc/mktree:
  mktree: validate entry type in input
  mktree --batch: build more than one tree object
  mktree --missing: updated usage message and man page
  mktree --missing: allow missing objects
  t1010: add mktree test
  mktree: do not barf on a submodule commit
  builtin-mktree.c: use a helper function to handle one line of input
  mktree: use parse-options
  build-in git-mktree
---

3d09e64ac10aab1ae6ae1ac9cce7a6ebb43f2e50