From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Nov 2018 09:23:56 +0000 (+0900)
Subject: Merge branch 'js/apply-recount-allow-noop'
X-Git-Tag: v2.20.0-rc0~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bda53f4185b8f7d2197176fe83afcb8d5f47368b

Merge branch 'js/apply-recount-allow-noop'

When editing a patch in a "git add -i" session, a hunk could be
made to no-op.  The "git apply" program used to reject a patch with
such a no-op hunk to catch user mistakes, but it is now updated to
explicitly allow a no-op hunk in an edited patch.

* js/apply-recount-allow-noop:
apply --recount: allow "no-op hunks"
---

bda53f4185b8f7d2197176fe83afcb8d5f47368b