| commit | ac661a195eb3e94e0480ca08b05b4739713f2fbb | |
| author | Simon Rowe <simon.rowe@eu.citrix.com> | |
| Tue, 4 Oct 2016 12:13:39 +0000 (4 13:13 +0100) | ||
| committer | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> | |
| Mon, 10 Oct 2016 14:01:17 +0000 (10 10:01 -0400) | ||
| tree | 1d232f00b24ffbd85a56900437bb6e403d8c8791 | treesnapshot (tar.gz zip) |
| parent | d19b9442cd2b9c07787b1d26ccf795601ebe0283 | commitdiff |
Make git apply context configurable
Experience has shown that limiting context to a single line can result
in patches silently applying at the wrong location. Add a config
parameter guilt.diffcontext that is either 'true' (use all context) or
the number of lines to match.
The default for guilt.diffcontext remains as one line.
Signed-off-by: Simon Rowe <simon.rowe@eu.citrix.com>
[jeffpc: minor coding style fixup]
[jeffpc: move default context assignment into case]
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Experience has shown that limiting context to a single line can result
in patches silently applying at the wrong location. Add a config
parameter guilt.diffcontext that is either 'true' (use all context) or
the number of lines to match.
The default for guilt.diffcontext remains as one line.
Signed-off-by: Simon Rowe <simon.rowe@eu.citrix.com>
[jeffpc: minor coding style fixup]
[jeffpc: move default context assignment into case]
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
| guilt | diffblobblamehistory |