merge-recursive: fix some overly long lines

Elijah Newren committed about 7 years ago

cache-tree: share code between functions writing an index as a tree

Elijah Newren committed about 7 years ago

merge-recursive: don't force external callers to do our logging

Elijah Newren committed about 7 years ago

merge-recursive: remove useless parameter in merge_trees()

Elijah Newren committed about 7 years ago

merge-recursive: exit early if index != head

Elijah Newren committed about 7 years ago

Ensure index matches head before invoking merge machinery, round N

Elijah Newren committed about 7 years ago

merge-recursive: remove another implicit dependency on the_repository

Elijah Newren committed about 7 years ago

merge-recursive: future-proof update_file_flags() against memory leaks

Elijah Newren committed about 7 years ago

merge-recursive: introduce an enum for detect_directory_renames values

Derrick Stolee committed about 7 years ago

merge-recursive: provide a better label for diff3 common ancestor

Elijah Newren committed about 7 years ago

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

Peter Krefting committed about 7 years ago

l10n: Update Catalan translation

Jordi Mas committed about 7 years ago

merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()

Elijah Newren committed about 7 years ago

checkout: provide better conflict hunk description with detached HEAD

Elijah Newren committed about 7 years ago

merge-recursive: be consistent with assert

Elijah Newren committed about 7 years ago

Git 2.23

Junio C Hamano committed about 7 years ago

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

Junio C Hamano committed about 7 years ago

checkout: remove duplicate code

Elijah Newren committed about 7 years ago

l10n: zh_CN: for git v2.23.0 l10n round 1~2

Jiang Xin committed about 7 years ago

http: use xmalloc with cURL

Carlo Marcelo Arenas Belón committed about 7 years ago