summaryrefslogtreecommitdiff
path: root/Documentation/git-gui.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-02-11 13:58:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-11 13:58:44 -0800
commitd3a035b055c81634ce99ab5fa5476a52d33029fe (patch)
tree925f5541e5b02e516f4fd9675a65df73a60c4ed9 /Documentation/git-gui.txt
parentMerge branch 'en/ort-directory-rename' (diff)
parentmerge-ort: begin performance work; instrument with trace2_region_* calls (diff)
downloadtgif-d3a035b055c81634ce99ab5fa5476a52d33029fe.tar.xz
Merge branch 'en/merge-ort-perf'
The "ort" merge strategy. * en/merge-ort-perf: merge-ort: begin performance work; instrument with trace2_region_* calls merge-ort: ignore the directory rename split conflict for now merge-ort: fix massive leak
Diffstat (limited to 'Documentation/git-gui.txt')
0 files changed, 0 insertions, 0 deletions