| commit | bb6ac5ea13250b295b4620face2ea5c0c9809b0b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Sep 2014 21:05:10 +0000 (19 14:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Sep 2014 21:05:10 +0000 (19 14:05 -0700) | ||
| tree | d77b828c677f42830807ea42fe0cd4dd191deb4d | treesnapshot (tar.gz zip) |
| parent | 04cd47f553796263451c946061e175d847f388c3 | commitdiff |
| parent | 477a08af04c227064860ce99197c501037f7f39c | commitdiff |
Merge branch 'jc/apply-ws-prefix' into maint
* jc/apply-ws-prefix:
apply: omit ws check for excluded paths
apply: hoist use_patch() helper for path exclusion up
apply: use the right attribute for paths in non-Git patches
Conflicts:
builtin/apply.c
* jc/apply-ws-prefix:
apply: omit ws check for excluded paths
apply: hoist use_patch() helper for path exclusion up
apply: use the right attribute for paths in non-Git patches
Conflicts:
builtin/apply.c
| builtin/apply.c | diff1 | diff2 | blobhistory |
| t/t4119-apply-config.sh | diff1 | diff2 | blobhistory |