merge-ort: handle book-keeping around two- and three-way content merge

Elijah Newren committed over 5 years ago

merge-ort: copy find_first_merges() implementation from merge-recursive.c

Elijah Newren committed over 5 years ago

merge-ort: implement unique_path() helper

Elijah Newren committed over 5 years ago

merge-ort: implement format_commit()

Elijah Newren committed over 5 years ago

merge-ort: handle directory/file conflicts that remain

Elijah Newren committed over 5 years ago

merge-ort: copy and adapt merge_submodule() from merge-recursive.c

Elijah Newren committed over 5 years ago

merge-ort: handle D/F conflict where directory disappears due to merge

Elijah Newren committed over 5 years ago

merge-ort: copy and adapt merge_3way() from merge-recursive.c

Elijah Newren committed over 5 years ago

CoC: explicitly take any whitespace breakage

Junio C Hamano committed over 5 years ago

CoC: Update word-wrapping to match upstream

Ævar Arnfjörð Bjarmason committed over 5 years ago

Git 2.30

Junio C Hamano committed over 5 years ago

Merge branch 'pb/doc-git-linkit-fix'

Junio C Hamano committed over 5 years ago

Merge tag 'l10n-2.30.0-rnd2' of https://github.com/git-l10n/git-po

Junio C Hamano committed over 5 years ago

l10n: zh_CN: for git v2.30.0 l10n round 1 and 2

Jiang Xin committed over 5 years ago

Merge branch 'l10n/zh_TW/201223' of github.com:l10n-tw/git-po

Jiang Xin committed over 5 years ago

l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated)

pan93412 committed over 5 years ago

l10n: pl.po: add translation and set team leader

Arusekk committed almost 6 years ago

Git 2.30-rc2

Junio C Hamano committed over 5 years ago

Merge branch 'nk/refspecs-negative-fix'

Junio C Hamano committed over 5 years ago

Merge branch 'ma/maintenance-crontab-fix'

Junio C Hamano committed over 5 years ago