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)
commitefd02e92c9961063bae63da7f7446868a38f14ce
tree33bfacf99973b81ffb535185215d6346121460e3
parent2951df7a9afd1dc17bbca62af4bde340e1d9368f
parentea5070c91f23e41a88dec48d2f8d96444c2d647a
Merge branch 'jl/read-tree-m-dry-run'

* 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