• Junio C Hamano's avatar
    Merge branch 'js/apply-recount-allow-noop' · bda53f41
    Junio C Hamano authored
    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"
    bda53f41
apply.c 130 KB