AgeCommit message (Expand)Author
2019-10-08merge-recursive: fix the fix to the diff3 common ancestor labelElijah Newren
2019-10-02merge-recursive: fix the diff3 common ancestor label for virtual commitsElijah Newren
2019-08-19merge-recursive: alphabetize include listElijah Newren
2019-08-19merge-recursive: add sanity checks for relevant merge_optionsElijah Newren
2019-08-19merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Elijah Newren
2019-08-19merge-recursive: split internal fields into a separate structElijah Newren
2019-08-19merge-recursive: avoid losing output and leaking memory holding that outputElijah Newren
2019-08-19merge-recursive: comment and reorder the merge_options fieldsElijah Newren
2019-08-19merge-recursive: consolidate unnecessary fields in merge_optionsElijah Newren
2019-08-19merge-recursive: move some definitions around to clean up the headerElijah Newren
2019-08-19merge-recursive: rename merge_options argument to opt in headerElijah Newren
2019-08-19merge-recursive: rename 'mrtree' to 'result_tree', for clarityElijah Newren
2019-08-19merge-recursive: use common name for ancestors/common/base_listElijah Newren
2019-08-19merge-recursive: fix some overly long linesElijah Newren
2019-08-19cache-tree: share code between functions writing an index as a treeElijah Newren
2019-08-19merge-recursive: don't force external callers to do our loggingElijah Newren
2019-08-19merge-recursive: remove useless parameter in merge_trees()Elijah Newren
2019-08-19merge-recursive: exit early if index != headElijah Newren
2019-08-19Ensure index matches head before invoking merge machinery, round NElijah Newren
2019-08-19merge-recursive: remove another implicit dependency on the_repositoryElijah Newren
2019-08-19merge-recursive: future-proof update_file_flags() against memory leaksElijah Newren
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee
2019-08-19merge-recursive: provide a better label for diff3 common ancestorElijah Newren
2019-08-16merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()Elijah Newren
2019-08-16checkout: provide better conflict hunk description with detached HEADElijah Newren
2019-08-16merge-recursive: be consistent with assertElijah Newren
2019-08-16Git 2.23v2.23.0Junio C Hamano
2019-08-16Merge tag 'l10n-2.23.0-rnd2' of git:// C Hamano
2019-08-16l10n: zh_CN: for git v2.23.0 l10n round 1~2Jiang Xin
2019-08-12l10n: de.po: Update German translationMatthias Ruester
2019-08-12Merge branch 'master' of Xin
2019-08-12Merge branch 'update-italian-translation' of Xin
2019-08-12Merge branch 'next' of Xin
2019-08-12Sync with Git 2.22.1Junio C Hamano
2019-08-12doc: fix repeated wordsMark Rushakoff
2019-08-11Git 2.22.1v2.22.1Junio C Hamano
2019-08-11.mailmap: update email address of Philip OakleyPhilip Oakley
2019-08-11l10n: it.po: update the Italian localization for v2.23.0 round 2Alessandro Menti
2019-08-11l10n: vi(4674t): Updated translation for VietnameseTran Ngoc Quan
2019-08-10l10n: es: 2.23.0 round 2Christopher Diaz Riveros
2019-08-10l10n: fr v2.23.0 round 2Jean-Noël Avila
2019-08-10l10n: git.pot: v2.23.0 round 2 (4 new, 6 removed)Jiang Xin
2019-08-10Merge tag 'v2.23.0-rc2' of git:// Xin
2019-08-10l10n: bg.po: Updated Bulgarian translation (4674t)Alexander Shopov
2019-08-09Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maintJunio C Hamano
2019-08-09Merge branch 'jk/no-system-includes-in-dot-c' into maintJunio C Hamano
2019-08-09Merge branch 'sg/fsck-config-in-doc' into maintJunio C Hamano
2019-08-09Merge branch 'jk/xdiff-clamp-funcname-context-index' into maintJunio C Hamano
2019-08-09Git 2.23-rc2v2.23.0-rc2Junio C Hamano
2019-08-09Merge branch 'bc/hash-independent-tests-part-4'Junio C Hamano