summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-08-19archive-tar: fix pax extended header length calculationRené Scharfe2-2/+2
2019-08-19archive-tar: report wrong pax extended header lengthRené Scharfe2-0/+26
2019-08-19merge-recursive: alphabetize include listElijah Newren1-16/+17
2019-08-19merge-recursive: add sanity checks for relevant merge_optionsElijah Newren1-0/+24
2019-08-19merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Elijah Newren2-10/+10
2019-08-19merge-recursive: split internal fields into a separate structElijah Newren2-97/+105
2019-08-19merge-recursive: avoid losing output and leaking memory holding that outputElijah Newren2-4/+5
2019-08-19merge-recursive: comment and reorder the merge_options fieldsElijah Newren2-19/+37
2019-08-19merge-recursive: consolidate unnecessary fields in merge_optionsElijah Newren2-20/+13
2019-08-19merge-recursive: move some definitions around to clean up the headerElijah Newren2-45/+73
2019-08-19merge-recursive: rename merge_options argument to opt in headerElijah Newren1-8/+8
2019-08-19merge-recursive: rename 'mrtree' to 'result_tree', for clarityElijah Newren1-3/+4
2019-08-19merge-recursive: use common name for ancestors/common/base_listElijah Newren2-42/+44
2019-08-19merge-recursive: fix some overly long linesElijah Newren1-6/+13
2019-08-19cache-tree: share code between functions writing an index as a treeElijah Newren5-58/+67
2019-08-19merge-recursive: don't force external callers to do our loggingElijah Newren2-5/+3
2019-08-19merge-recursive: remove useless parameter in merge_trees()Elijah Newren4-12/+22
2019-08-19merge-recursive: exit early if index != headElijah Newren1-29/+72
2019-08-19Ensure index matches head before invoking merge machinery, round NElijah Newren3-1/+14
2019-08-19merge-recursive: remove another implicit dependency on the_repositoryElijah Newren1-2/+5
2019-08-19merge-recursive: future-proof update_file_flags() against memory leaksElijah Newren1-3/+5
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee3-11/+21
2019-08-19merge-recursive: provide a better label for diff3 common ancestorElijah Newren3-4/+209
2019-08-17l10n: sv.po: Update Swedish translation (4674t0f0u)Peter Krefting1-497/+509
2019-08-17l10n: Update Catalan translationJordi Mas1-30/+30
2019-08-16merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()Elijah Newren1-10/+9
2019-08-16checkout: provide better conflict hunk description with detached HEADElijah Newren1-0/+8
2019-08-16merge-recursive: be consistent with assertElijah Newren1-1/+1
2019-08-16Git 2.23v2.23.0Junio C Hamano1-1/+1
2019-08-16Merge tag 'l10n-2.23.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano11-36249/+46985
2019-08-16checkout: remove duplicate codeElijah Newren1-7/+0
2019-08-16l10n: zh_CN: for git v2.23.0 l10n round 1~2Jiang Xin1-2910/+3413
2019-08-15http: use xmalloc with cURLCarlo Marcelo Arenas Belón1-0/+4
2019-08-15diff: 'diff.indentHeuristic' is no longer experimentalSZEDER Gábor1-1/+1
2019-08-13repo-settings: create feature.experimental settingDerrick Stolee9-45/+60
2019-08-13repo-settings: create feature.manyFiles settingDerrick Stolee6-7/+51
2019-08-13repo-settings: parse core.untrackedCacheDerrick Stolee5-36/+40
2019-08-13commit-graph: turn on commit-graph by defaultDerrick Stolee7-6/+12
2019-08-13t6501: use 'git gc' in quiet modeDerrick Stolee1-3/+3
2019-08-13repo-settings: consolidate some config settingsDerrick Stolee7-19/+58
2019-08-13worktree remove: clarify error message on dirty worktreeSZEDER Gábor1-1/+1
2019-08-13completion: complete config variables and values for 'git clone --config='SZEDER Gábor2-17/+70
2019-08-13completion: complete config variables names and values for 'git clone -c'SZEDER Gábor1-0/+6
2019-08-13completion: complete values of configuration variables after 'git -c var='SZEDER Gábor2-24/+48
2019-08-13completion: complete configuration sections and variable names for 'git -c'SZEDER Gábor2-13/+60
2019-08-13completion: split _git_config()SZEDER Gábor1-9/+30
2019-08-13completion: simplify inner 'case' pattern in __gitcomp()SZEDER Gábor1-2/+2
2019-08-13completion: use 'sort -u' to deduplicate config variable namesSZEDER Gábor1-1/+1
2019-08-13completion: deduplicate configuration sectionsSZEDER Gábor2-2/+10
2019-08-13completion: add tests for 'git config' completionSZEDER Gábor1-0/+21