ll_union_merge(): pass name labels to ll_xdl_merge()

Jeff King committed about 5 years ago

ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION

Jeff King committed about 5 years ago

The first batch post Git 2.32

Junio C Hamano committed about 5 years ago

Merge branch 'ah/setup-extensions-message-i18n-fix'

Junio C Hamano committed about 5 years ago

Merge branch 'ah/fetch-reject-warning-grammofix'

Junio C Hamano committed about 5 years ago

Merge branch 'jk/doc-color-pager'

Junio C Hamano committed about 5 years ago

Merge branch 'tl/fix-packfile-uri-doc'

Junio C Hamano committed about 5 years ago

Merge branch 'ry/clarify-fast-forward-in-glossary'

Junio C Hamano committed about 5 years ago

Merge branch 'wm/rev-parse-die-i18n'

Junio C Hamano committed about 5 years ago

Merge branch 'jc/clarify-revision-range'

Junio C Hamano committed about 5 years ago

Merge branch 'ah/doc-describe'

Junio C Hamano committed about 5 years ago

Merge branch 'ah/submodule-helper-module-summary-parseopt'

Junio C Hamano committed about 5 years ago

Merge branch 'ah/stash-usage-i18n-fix'

Junio C Hamano committed about 5 years ago

Merge branch 'ah/merge-usage-i18n-fix'

Junio C Hamano committed about 5 years ago

Merge branch 'jn/size-t-casted-to-off-t-fix'

Junio C Hamano committed about 5 years ago

Merge branch 'mt/parallel-checkout-with-padded-oidcpy'

Junio C Hamano committed about 5 years ago

Merge branch 'ef/mailinfo-short-name'

Junio C Hamano committed about 5 years ago

gitweb: use HEAD as secondary sort key in git_get_heads_list()

Greg Hurrell committed about 5 years ago

merge-ort: miscellaneous touch-ups

Elijah Newren committed about 5 years ago

Fix various issues found in comments

Elijah Newren committed about 5 years ago