git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 04cd47f 477a08a)
Merge branch 'jc/apply-ws-prefix' into maint
authorJunio C Hamano <redacted>
Fri, 19 Sep 2014 21:05:10 +0000 (14:05 -0700)
committerJunio C Hamano <redacted>
Fri, 19 Sep 2014 21:05:10 +0000 (14:05 -0700)
commitbb6ac5ea13250b295b4620face2ea5c0c9809b0b
treed77b828c677f42830807ea42fe0cd4dd191deb4dtree | snapshot
parent04cd47f553796263451c946061e175d847f388c3commit | diff
parent477a08af04c227064860ce99197c501037f7f39ccommit | diff
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
builtin/apply.c diff1 | diff2 | blob | history
t/t4119-apply-config.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT