| commit | 6ec48e7382a572734d4ea9f6c2803dd64f5bb2e2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2011 00:38:59 +0000 (9 16:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2011 00:38:59 +0000 (9 16:38 -0800) | ||
| tree | 986d470a98c1d3cbaca0753f59b0b2fd19988bd6 | treesnapshot (tar.gz zip) |
| parent | 1bb74efa6e43e8dbe95901b6d289ed4d529596ad | commitdiff |
| parent | 9d158601b3cb9753825e21441c88d31297b97be5 | commitdiff |
Merge branch 'jc/maint-apply-no-double-patch' into next
* jc/maint-apply-no-double-patch:
apply: do not patch lines that were already patched
* jc/maint-apply-no-double-patch:
apply: do not patch lines that were already patched
| builtin/apply.c | diff1 | diff2 | blobhistory |