diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:10 -0700 |
| commit | bb6ac5ea13250b295b4620face2ea5c0c9809b0b (patch) | |
| tree | d77b828c677f42830807ea42fe0cd4dd191deb4d /git-mergetool--lib.sh | |
| parent | Merge branch 'jk/command-line-config-empty-string' into maint (diff) | |
| parent | apply: omit ws check for excluded paths (diff) | |
| download | tgif-bb6ac5ea13250b295b4620face2ea5c0c9809b0b.tar.xz | |
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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions