summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-07-06 22:09:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-07-06 22:09:18 -0700
commitefafdca42162843e90cefdeefd8e6c244cee91f5 (patch)
tree7cdfdc1a5604687c08b0a606af013d616877b028 /Documentation/technical/trivial-merge.txt
parentMerge branch 'jk/fast-export-anonym-alt' (diff)
parentlib-submodule-update: pass 'test_must_fail' as an argument (diff)
downloadtgif-efafdca42162843e90cefdeefd8e6c244cee91f5.tar.xz
Merge branch 'dl/test-must-fail-fixes-5'
The effort to avoid using test_must_fail on non-git command continues. * dl/test-must-fail-fixes-5: lib-submodule-update: pass 'test_must_fail' as an argument lib-submodule-update: prepend "git" to $command lib-submodule-update: consolidate --recurse-submodules lib-submodule-update: add space after function name
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions