diff-merges: introduce revs->first_parent_merges flag

Sergey Organov committed over 5 years ago

diff-merges: new function diff_merges_set_dense_combined_if_unset()

Sergey Organov committed over 5 years ago

diff-merges: new function diff_merges_suppress()

Sergey Organov committed over 5 years ago

diff-merges: re-arrange functions to match the order they are called in

Sergey Organov committed over 5 years ago

diff-merges: rename diff_merges_default_to_enable() to match semantics

Sergey Organov committed over 5 years ago

diff-merges: move checks for first_parent_only out of the module

Sergey Organov committed over 5 years ago

diff-merges: rename all functions to have common prefix

Sergey Organov committed over 5 years ago

revision: move diff merges functions to its own diff-merges.c

Sergey Organov committed over 5 years ago

revision: provide implementation for diff merges tweaks

Sergey Organov committed over 5 years ago

revision: factor out initialization of diff-merge related settings

Sergey Organov committed over 5 years ago

revision: factor out setup of diff-merge related settings

Sergey Organov committed over 5 years ago

revision: factor out parsing of diff-merge related options

Sergey Organov committed over 5 years ago

worktree: teach `repair` to fix multi-directional breakage

Eric Sunshine committed over 5 years ago

test: bisect-porcelain: fix location of files

Felipe Contreras committed over 5 years ago

l10n: fr.po v2.30.0 rnd 2

Jean-Noël Avila committed over 5 years ago

l10n: tr: v2.30.0-r2

Emir Sarı committed over 5 years ago

l10n: sv.po: Update Swedish translation (5037t0f0u)

Peter Krefting committed over 5 years ago

l10n: vi.po(5037t): v2.30.0 rnd 2

Tran Ngoc Quan committed over 5 years ago

l10n: git.pot: v2.30.0 round 2 (1 new, 2 removed)

Jiang Xin committed over 5 years ago

Merge remote-tracking branch 'github/master' into git-po-master

Jiang Xin committed over 5 years ago