summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-01-05mktag tests: run "fsck" after creating "mytag"Ævar Arnfjörð Bjarmason1-1/+2
2021-01-05mktag tests: don't create "mytag" twiceÆvar Arnfjörð Bjarmason1-12/+5
2021-01-05mktag tests: don't redirect stderr to a file needlesslyÆvar Arnfjörð Bjarmason2-3/+3
2021-01-05mktag tests: remove needless SHA-1 hardcodingÆvar Arnfjörð Bjarmason1-3/+3
2021-01-05mktag tests: use "test_commit" helperÆvar Arnfjörð Bjarmason1-3/+1
2021-01-05mktag tests: don't needlessly use a subshellÆvar Arnfjörð Bjarmason1-1/+1
2021-01-05mktag doc: update to explain why to use thisÆvar Arnfjörð Bjarmason1-4/+13
2021-01-05maintenance: use Windows scheduled tasksDerrick Stolee3-1/+226
2021-01-05maintenance: use launchctl on macOSDerrick Stolee3-1/+286
2021-01-04completion: add proper public __git_completeFelipe Contreras2-8/+46
2021-01-04test: completion: add tests for __git_completeFelipe Contreras1-0/+8
2021-01-04completion: bash: improve function detectionFelipe Contreras1-1/+1
2021-01-04completion: bash: add __git_have_func helperFelipe Contreras1-3/+7
2021-01-04rebase: verify commit parameterRené Scharfe1-1/+3
2021-01-04cache-tree: use trace2 in cache_tree_update()Derrick Stolee1-0/+2
2021-01-04unpack-trees: add trace2 regionsDerrick Stolee1-0/+5
2021-01-04tree-walk: report recursion countsDerrick Stolee1-0/+33
2021-01-04revision: trace topo-walk statisticsDerrick Stolee1-0/+31
2021-01-04hash-lookup: rename from sha1-lookupMartin Ågren14-25/+25
2021-01-04sha1-lookup: rename `sha1_pos()` as `hash_pos()`Martin Ågren8-15/+15
2021-01-04object-file.c: rename from sha1-file.cMartin Ågren4-7/+7
2021-01-04object-name.c: rename from sha1-name.cMartin Ågren4-11/+11
2021-01-04pack-format.txt: document sizes at start of delta dataMartin Ågren1-1/+16
2021-01-04diffcore-rename: remove unnecessary duplicate entry checksElijah Newren2-24/+1
2021-01-04t6016: move to lib-log-graph.sh frameworkAntonio Russo1-187/+167
2021-01-04t1300: don't needlessly work with `core.foo` configsMartin Ågren1-30/+30
2021-01-04t1300: remove duplicate test for `--file no-such-file`Martin Ågren1-6/+2
2021-01-04t1300: remove duplicate test for `--file ../foo`Martin Ågren1-4/+0
2021-01-04gitmodules.txt: fix 'GIT_WORK_TREE' variable namePhilippe Blain1-15/+15
2021-01-04doc: fix some typosThomas Ackermann6-7/+7
2021-01-04merge-ort: flesh out implementation of handle_content_merge()Elijah Newren1-6/+143
2021-01-04merge-ort: add handling for different types of files at same pathElijah Newren1-4/+103
2021-01-04merge-ort: handle book-keeping around two- and three-way content mergeElijah Newren1-11/+41
2021-01-04merge-ort: copy find_first_merges() implementation from merge-recursive.cElijah Newren1-1/+56
2021-01-04merge-ort: implement unique_path() helperElijah Newren1-1/+24
2021-01-04merge-ort: implement format_commit()Elijah Newren1-1/+13
2021-01-04merge-ort: handle directory/file conflicts that remainElijah Newren1-2/+84
2021-01-04merge-ort: copy and adapt merge_submodule() from merge-recursive.cElijah Newren1-1/+125
2021-01-04merge-ort: handle D/F conflict where directory disappears due to mergeElijah Newren1-1/+22
2021-01-04merge-ort: copy and adapt merge_3way() from merge-recursive.cElijah Newren1-1/+53
2021-01-04CoC: explicitly take any whitespace breakageJunio C Hamano1-0/+1
2021-01-04CoC: Update word-wrapping to match upstreamÆvar Arnfjörð Bjarmason1-19/+16
2020-12-27Git 2.30v2.30.0Junio C Hamano2-12/+9
2020-12-27Merge branch 'pb/doc-git-linkit-fix'Junio C Hamano1-2/+2
2020-12-27Merge tag 'l10n-2.30.0-rnd2' of https://github.com/git-l10n/git-poJunio C Hamano12-26547/+53354
2020-12-27l10n: zh_CN: for git v2.30.0 l10n round 1 and 2Jiang Xin1-2475/+2588
2020-12-25Merge branch 'l10n/zh_TW/201223' of github.com:l10n-tw/git-poJiang Xin1-2744/+2602
2020-12-25l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated)pan934121-2744/+2602
2020-12-23l10n: pl.po: add translation and set team leaderArusekk2-8906/+22300
2020-12-23Git 2.30-rc2v2.30.0-rc2Junio C Hamano2-1/+6