Merge branch 'mz/oneway-merge-wo-u-no-lstat'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Jan 2013 06:11:39 +0000 (22:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Jan 2013 06:11:39 +0000 (22:11 -0800)
Optimize "read-tree -m <tree-ish>" without "-u".

* mz/oneway-merge-wo-u-no-lstat:
  oneway_merge(): only lstat() when told to update worktree


Trivial merge