summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2018-06-28 18:05:00 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-03 09:33:03 -0700
commit66f9722882993f60be656afaae4c5c9ac92957e9 (patch)
tree7e546e5510b69ec315fb92fb25838dba0d6793f8 /Documentation/merge-strategies.txt
parentSecond batch for 2.19 cycle (diff)
downloadtgif-66f9722882993f60be656afaae4c5c9ac92957e9.tar.xz
config: turn die_on_error into caller-facing enum
The config code has a die_on_error flag, which lets us emit an error() instead of dying when we see a bogus config file. But there's no way for a caller of the config code to set this: it's auto-set based on whether we're reading a file or a blob. Instead, let's add it to the config_options struct. When it's not set (or we have no options) we'll continue to fall back to the existing file/blob behavior. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions