From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 19:41:34 +0000 (-0700)
Subject: Merge branch 'nd/cherry-pick-quit-fix'
X-Git-Tag: v2.19.0-rc0~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39e415cfd1390ed31a61ca0ca175530302c9a58c;p=thirdparty%2Fgit.git

Merge branch 'nd/cherry-pick-quit-fix'

"git cherry-pick --quit" failed to remove CHERRY_PICK_HEAD even
though we won't be in a cherry-pick session after it returns, which
has been corrected.

* nd/cherry-pick-quit-fix:
  cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD
---

39e415cfd1390ed31a61ca0ca175530302c9a58c