Merge branch 'jl/read-tree-m-dry-run'
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:08:48 +0000 (12:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:08:48 +0000 (12:08 -0700)
* jl/read-tree-m-dry-run:
  Teach read-tree the -n|--dry-run option
  unpack-trees: add the dry_run flag to unpack_trees_options


Trivial merge