summaryrefslogtreecommitdiff
path: root/t/t4112-apply-renames.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-18 18:23:56 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-18 18:23:56 +0900
commitbda53f4185b8f7d2197176fe83afcb8d5f47368b (patch)
tree3db4c003ea5af15f7bff6246dfe6084636096be5 /t/t4112-apply-renames.sh
parentMerge branch 'ra/rev-parse-exclude-glob' (diff)
parentapply --recount: allow "no-op hunks" (diff)
downloadtgif-bda53f4185b8f7d2197176fe83afcb8d5f47368b.tar.xz
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"
Diffstat (limited to 't/t4112-apply-renames.sh')
0 files changed, 0 insertions, 0 deletions