summaryrefslogtreecommitdiff
path: root/Documentation/git-sparse-checkout.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-21 15:14:39 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-21 15:14:39 -0800
commitd203add8925f4744f6bad6b84870988efe108262 (patch)
tree80b6ddacb7b46e4cba649882b2b9c76882826bd0 /Documentation/git-sparse-checkout.txt
parentMerge branch 'ab/config-mak-uname-simplify' (diff)
parentmergetool: avoid letting `list_tool_variants` break user-defined setups (diff)
downloadtgif-d203add8925f4744f6bad6b84870988efe108262.tar.xz
Merge branch 'pd/mergetool-nvimdiff'
Fix regression introduced when nvimdiff support in mergetool was added. * pd/mergetool-nvimdiff: mergetool: avoid letting `list_tool_variants` break user-defined setups mergetools/bc: add `bc4` to the alias list for Beyond Compare
Diffstat (limited to 'Documentation/git-sparse-checkout.txt')
0 files changed, 0 insertions, 0 deletions