summaryrefslogtreecommitdiff
path: root/compat/mkdir.c
diff options
context:
space:
mode:
authorLibravatar Seth House <seth@eseth.com>2021-02-09 13:07:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-09 14:09:16 -0800
commit9d9cf230317f7fe7cb153f61b537e6e9bef22e3b (patch)
treee9af48e455604339c03366d3c868d2eefc735593 /compat/mkdir.c
parentmergetool: break setup_tool out into separate initialization function (diff)
downloadtgif-9d9cf230317f7fe7cb153f61b537e6e9bef22e3b.tar.xz
mergetool: add per-tool support and overrides for the hideResolved flag
Add a per-tool override flag so that users may enable the flag for one tool and disable it for another by setting `mergetool.<tool>.hideResolved` to `false`. In addition, the author or maintainer of a mergetool may optionally override the default `hideResolved` value for that mergetool. If the `mergetools/<tool>` shell script contains a `hide_resolved_enabled` function it will be called when the mergetool is invoked and the return value will be used as the default for the `hideResolved` flag. hide_resolved_enabled () { return 1 } Disabling may be desirable if the mergetool wants or needs access to the original, unmodified 'LOCAL' and 'REMOTE' versions of the conflicted file. For example: - A tool may use a custom conflict resolution algorithm and prefer to ignore the results of Git's conflict resolution. - A tool may want to visually compare/constrast the version of the file from before the merge (saved to 'LOCAL', 'REMOTE', and 'BASE') with Git's conflict resolution results (saved to 'MERGED'). Helped-by: Johannes Sixt <j6t@kdbg.org> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Seth House <seth@eseth.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/mkdir.c')
0 files changed, 0 insertions, 0 deletions