From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Nov 2011 02:22:08 +0000 (-0800)
Subject: Merge branch 'jn/revert-quit'
X-Git-Tag: v1.7.8-rc4~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9fd389b65002e0e23deb2c7328360f246afec0d4;p=git.git

Merge branch 'jn/revert-quit'

* jn/revert-quit:
  revert: remove --reset compatibility option
  revert: introduce --abort to cancel a failed cherry-pick
  revert: write REVERT_HEAD pseudoref during conflicted revert
  revert: improve error message for cherry-pick during cherry-pick
  revert: rearrange pick_revisions() for clarity
  revert: rename --reset option to --quit
---

9fd389b65002e0e23deb2c7328360f246afec0d4