summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-03-16 17:53:07 -0700
committerJunio C Hamano <gitster@pobox.com>2022-03-16 17:53:07 -0700
commit8d1ae40bae1568be25dcc55679f1635b90d53d1b (patch)
treee915b9e846e6390a2c7107def2cf7cad836474be /merge-recursive.c
parent6969ac64bf1c7bc43e897d6bfe7d2450d37e9aa9 (diff)
parent5445124fad4db6c6646edc8b9b0348794fd7e439 (diff)
downloadgit-8d1ae40bae1568be25dcc55679f1635b90d53d1b.tar.gz
Merge branch 'mf/fix-type-in-config-h'
"git config -h" did not describe the "--type" option correctly. * mf/fix-type-in-config-h: config: correct "--type" option in "git config -h" output
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions