Code

Merge branch 'jc/rerere-remaining' into pu
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800)
commit7a3dcd3619f804fd64cc8fa14e7e067d32c631f0
tree4857c56efd38f195bcfe523e55373f840efc1bf4
parent71ab769877886fb116cfc3ff445037ff0424fdd2
parentf322b3569024e4325c653d56bb939dc7b062033a
Merge branch 'jc/rerere-remaining' into pu

* jc/rerere-remaining:
  rerere "remaining"