Merge branch 'master' into next
commit17fe32c7d63fc9139bed60cd8426a2b2b2d3aec0
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Nov 2011 05:53:04 +0000 (16 21:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Nov 2011 05:53:04 +0000 (16 21:53 -0800)
tree4727a640b0cf77390d4f770a8f5d69acc6193469
parent25e8838c64d682085add200f3059e1036a278880
parent09116a1c31e3754cb18bb69ef057342cd7808935
Merge branch 'master' into next

* master:
  refs: loosen over-strict "format" check
  revert: prettify fatal messages
  Revert "upload-archive: use start_command instead of fork"

Conflicts:
refs.c
builtin/revert.c
refs.c