summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-10-08merge-recursive: fix the fix to the diff3 common ancestor labelLibravatar Elijah Newren1-1/+2
2019-10-02merge-recursive: fix the diff3 common ancestor label for virtual commitsLibravatar Elijah Newren2-1/+19
2019-08-19merge-recursive: alphabetize include listLibravatar Elijah Newren1-16/+17
2019-08-19merge-recursive: add sanity checks for relevant merge_optionsLibravatar Elijah Newren1-0/+24
2019-08-19merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Libravatar Elijah Newren2-10/+10
2019-08-19merge-recursive: split internal fields into a separate structLibravatar Elijah Newren2-97/+105
2019-08-19merge-recursive: avoid losing output and leaking memory holding that outputLibravatar Elijah Newren2-4/+5
2019-08-19merge-recursive: comment and reorder the merge_options fieldsLibravatar Elijah Newren2-19/+37
2019-08-19merge-recursive: consolidate unnecessary fields in merge_optionsLibravatar Elijah Newren2-20/+13
2019-08-19merge-recursive: move some definitions around to clean up the headerLibravatar Elijah Newren2-45/+73
2019-08-19merge-recursive: rename merge_options argument to opt in headerLibravatar Elijah Newren1-8/+8
2019-08-19merge-recursive: rename 'mrtree' to 'result_tree', for clarityLibravatar Elijah Newren1-3/+4
2019-08-19merge-recursive: use common name for ancestors/common/base_listLibravatar Elijah Newren2-42/+44
2019-08-19merge-recursive: fix some overly long linesLibravatar Elijah Newren1-6/+13
2019-08-19cache-tree: share code between functions writing an index as a treeLibravatar Elijah Newren5-58/+67
2019-08-19merge-recursive: don't force external callers to do our loggingLibravatar Elijah Newren2-5/+3
2019-08-19merge-recursive: remove useless parameter in merge_trees()Libravatar Elijah Newren4-12/+22
2019-08-19merge-recursive: exit early if index != headLibravatar Elijah Newren1-29/+72
2019-08-19Ensure index matches head before invoking merge machinery, round NLibravatar Elijah Newren3-1/+14
2019-08-19merge-recursive: remove another implicit dependency on the_repositoryLibravatar Elijah Newren1-2/+5
2019-08-19merge-recursive: future-proof update_file_flags() against memory leaksLibravatar Elijah Newren1-3/+5
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesLibravatar Derrick Stolee3-11/+21
2019-08-19merge-recursive: provide a better label for diff3 common ancestorLibravatar Elijah Newren3-4/+209
2019-08-16merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()Libravatar Elijah Newren1-10/+9
2019-08-16checkout: provide better conflict hunk description with detached HEADLibravatar Elijah Newren1-0/+8
2019-08-16merge-recursive: be consistent with assertLibravatar Elijah Newren1-1/+1
2019-08-16Git 2.23Libravatar Junio C Hamano1-1/+1
2019-08-16Merge tag 'l10n-2.23.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano11-36251/+46987
2019-08-16l10n: zh_CN: for git v2.23.0 l10n round 1~2Libravatar Jiang Xin1-2910/+3413
2019-08-12l10n: de.po: Update German translationLibravatar Matthias Ruester1-2910/+3533
2019-08-12Merge branch 'master' of https://github.com/vnwildman/gitLibravatar Jiang Xin1-585/+595
2019-08-12Merge branch 'update-italian-translation' of github.com:AlessandroMenti/git-poLibravatar Jiang Xin1-522/+531
2019-08-12Merge branch 'next' of https://github.com/ChrisADR/git-poLibravatar Jiang Xin1-3030/+3598
2019-08-11Sync with Git 2.22.1Libravatar Junio C Hamano2-0/+4
2019-08-11doc: fix repeated wordsLibravatar Mark Rushakoff9-9/+9
2019-08-11Git 2.22.1Libravatar Junio C Hamano2-1/+4
2019-08-11.mailmap: update email address of Philip OakleyLibravatar Philip Oakley1-0/+1
2019-08-11l10n: it.po: update the Italian localization for v2.23.0 round 2Libravatar Alessandro Menti1-522/+531
2019-08-11l10n: vi(4674t): Updated translation for VietnameseLibravatar Tran Ngoc Quan1-585/+595
2019-08-10l10n: es: 2.23.0 round 2Libravatar Christopher Diaz Riveros1-3030/+3598
2019-08-10l10n: fr v2.23.0 round 2Libravatar Jean-Noël Avila1-2904/+3429
2019-08-10l10n: git.pot: v2.23.0 round 2 (4 new, 6 removed)Libravatar Jiang Xin1-477/+461
2019-08-10Merge tag 'v2.23.0-rc2' of git://git.kernel.org/pub/scm/git/gitLibravatar Jiang Xin59-396/+1041
2019-08-10l10n: bg.po: Updated Bulgarian translation (4674t)Libravatar Alexander Shopov1-2937/+3481
2019-08-09Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maintLibravatar Junio C Hamano3-8/+0
2019-08-09Merge branch 'jk/no-system-includes-in-dot-c' into maintLibravatar Junio C Hamano3-3/+0
2019-08-09Merge branch 'sg/fsck-config-in-doc' into maintLibravatar Junio C Hamano1-0/+5
2019-08-09Merge branch 'jk/xdiff-clamp-funcname-context-index' into maintLibravatar Junio C Hamano2-2/+24
2019-08-09Git 2.23-rc2Libravatar Junio C Hamano1-1/+1
2019-08-09Merge branch 'bc/hash-independent-tests-part-4'Libravatar Junio C Hamano2-9/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 13:13:13 +0000