From: Pratyush Yadav <me@yadavpratyush.com>
Date: Wed, 11 Sep 2019 21:11:12 +0000 (+0530)
Subject: Merge branch 'py/revert-hunks-lines'
X-Git-Tag: v2.24.0-rc0~139^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c77abf04604d74859f3ec81c44cd4ef2b084ebde;p=thirdparty%2Fgit.git

Merge branch 'py/revert-hunks-lines'

git-gui learned to revert selected lines and hunks, just like it can
stage selected lines and hunks. To provide a safety net for accidental
revert, the most recent revert can be undone.

* py/revert-hunks-lines:
  git-gui: allow undoing last revert
  git-gui: return early when patch fails to apply
  git-gui: allow reverting selected hunk
  git-gui: allow reverting selected lines
---

c77abf04604d74859f3ec81c44cd4ef2b084ebde