merge-ort: make `path_messages` a strmap to a string_list

Johannes Schindelin committed about 4 years ago

merge-ort: store messages in a list, not in a single strbuf

Johannes Schindelin committed about 4 years ago

merge-tree: provide easy access to `ls-files -u` style info

Elijah Newren committed about 4 years ago

merge-tree: provide a list of which files have conflicts

Elijah Newren committed about 4 years ago

merge-ort: remove command-line-centric submodule message from merge-ort

Elijah Newren committed about 4 years ago

merge-ort: provide a merge_get_conflicted_files() helper function

Elijah Newren committed about 4 years ago

merge-tree: support including merge messages in output

Elijah Newren committed about 4 years ago

merge-ort: split out a separate display_update_messages() function

Elijah Newren committed about 4 years ago

merge-tree: implement real merges

Elijah Newren committed about 4 years ago

merge-tree: add option parsing and initial shell for real merge function

Elijah Newren committed about 4 years ago

merge-tree: move logic for existing merge into new function

Elijah Newren committed about 4 years ago

merge-tree: rename merge_trees() to trivial_merge_trees()

Elijah Newren committed about 4 years ago

grep: add --max-count command line option

Carlos López committed about 4 years ago

l10n: TEAMS: Change German translation team leader

Matthias Rüster committed about 4 years ago

l10n: de.po: Update German translation

Matthias Rüster committed about 4 years ago

Git 2.37-rc2

Junio C Hamano committed about 4 years ago

Merge branch 'tb/cruft-packs'

Junio C Hamano committed about 4 years ago

l10n: bg.po: Updated Bulgarian translation (5367t)

Alexander Shopov committed about 4 years ago

l10n: zh_CN: v2.37.0 round 1

Fangyi Zhou committed about 4 years ago

Merge branch 'master' of github.com:git/git

Jiang Xin committed about 4 years ago