From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jun 2010 18:55:39 +0000 (-0700)
Subject: Merge branch 'cc/cherry-pick-stdin'
X-Git-Tag: v1.7.2-rc1~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b;p=git.git

Merge branch 'cc/cherry-pick-stdin'

* cc/cherry-pick-stdin:
  revert: do not rebuild argv on heap
  revert: accept arbitrary rev-list options
  t3508 (cherry-pick): futureproof against unmerged files
---

01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b