summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* shortlog: remove unused(?) "repo-abbrev" featureÆvar Arnfjörð Bjarmason2021-01-129-56/+21
* mailmap doc + tests: document and test for case-insensitivityÆvar Arnfjörð Bjarmason2021-01-122-0/+19
* mailmap tests: add tests for empty "<>" syntaxÆvar Arnfjörð Bjarmason2021-01-121-0/+27
* mailmap tests: add tests for whitespace syntaxÆvar Arnfjörð Bjarmason2021-01-121-0/+52
* mailmap tests: add a test for comment syntaxÆvar Arnfjörð Bjarmason2021-01-121-0/+33
* mailmap doc + tests: add better examples & test themÆvar Arnfjörð Bjarmason2021-01-122-20/+117
* tests: refactor a few tests to use "test_commit --append"Ævar Arnfjörð Bjarmason2021-01-123-29/+8
* test-lib functions: add an --append option to test_commitÆvar Arnfjörð Bjarmason2021-01-122-33/+20
* test-lib functions: add --author support to test_commitÆvar Arnfjörð Bjarmason2021-01-122-6/+12
* test-lib functions: document arguments to test_commitÆvar Arnfjörð Bjarmason2021-01-121-0/+4
* test-lib functions: expand "test_commit" comment templateÆvar Arnfjörð Bjarmason2021-01-121-5/+3
* mailmap: test for silent exiting on missing file/blobÆvar Arnfjörð Bjarmason2021-01-121-1/+20
* mailmap tests: get rid of overly complex blame fuzzingÆvar Arnfjörð Bjarmason2021-01-121-20/+30
* mailmap tests: add a test for "not a blob" errorÆvar Arnfjörð Bjarmason2021-01-121-0/+9
* mailmap tests: remove redundant entry in testÆvar Arnfjörð Bjarmason2021-01-121-1/+0
* mailmap tests: improve --stdin testsÆvar Arnfjörð Bjarmason2021-01-121-8/+32
* mailmap tests: modernize syntax & test idiomsÆvar Arnfjörð Bjarmason2021-01-121-199/+274
* mailmap tests: use our preferred whitespace syntaxÆvar Arnfjörð Bjarmason2021-01-121-8/+8
* mailmap doc: start by mentioning the comment syntaxÆvar Arnfjörð Bjarmason2021-01-121-2/+3
* check-mailmap doc: note config optionsÆvar Arnfjörð Bjarmason2021-01-121-0/+7
* mailmap doc: quote config variables `like.this`Ævar Arnfjörð Bjarmason2021-01-121-2/+2
* mailmap doc: create a new "gitmailmap(5)" man pageÆvar Arnfjörð Bjarmason2021-01-126-7/+38
* The first batch in 2.31 cycleJunio C Hamano2021-01-073-2/+34
* Merge branch 'es/perf-export-fix'Junio C Hamano2021-01-071-4/+1
|\
| * t/perf: avoid unnecessary test_export() recursionEric Sunshine2020-12-221-4/+1
* | Merge branch 'fc/t6030-bisect-reset-removes-auxiliary-files'Junio C Hamano2021-01-071-8/+8
|\ \
| * | test: bisect-porcelain: fix location of filesFelipe Contreras2020-12-211-8/+8
* | | Merge branch 'es/worktree-repair-both-moved'Junio C Hamano2021-01-074-1/+73
|\ \ \
| * | | worktree: teach `repair` to fix multi-directional breakageEric Sunshine2020-12-214-1/+73
* | | | Merge branch 'en/merge-ort-recursive'Junio C Hamano2021-01-075-18/+138
|\ \ \ \
| * | | | merge-ort: implement merge_incore_recursive()Elijah Newren2020-12-172-2/+98
| * | | | merge-ort: make clear_internal_opts() aware of partial clearingElijah Newren2020-12-171-6/+7
| * | | | merge-ort: copy a few small helper functions from merge-recursive.cElijah Newren2020-12-171-0/+20
| * | | | commit: move reverse_commit_list() from merge-recursiveElijah Newren2020-12-173-11/+14
* | | | | Merge branch 'fc/pull-merge-rebase'Junio C Hamano2021-01-072-32/+104
|\ \ \ \ \
| * | | | | pull: display default warning only when non-ffFelipe Contreras2020-12-162-7/+66
| * | | | | pull: correct condition to trigger non-ff adviceJunio C Hamano2020-12-161-13/+19
| * | | | | pull: get rid of unnecessary global variableJunio C Hamano2020-12-161-6/+5
| * | | | | pull: give the advice for choosing rebase/merge much laterFelipe Contreras2020-12-141-14/+18
| * | | | | pull: refactor fast-forward checkFelipe Contreras2020-12-141-11/+15
* | | | | | Merge branch 'en/merge-ort-2'Junio C Hamano2021-01-071-19/+191
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | merge-ort: add modify/delete handling and delayed output processingElijah Newren2020-12-131-2/+98
| * | | | | merge-ort: add die-not-implemented stub handle_content_merge() functionElijah Newren2020-12-131-0/+14
| * | | | | merge-ort: add function grouping commentsElijah Newren2020-12-131-0/+21
| * | | | | merge-ort: add a paths_to_free field to merge_options_internalElijah Newren2020-12-131-1/+25
| * | | | | merge-ort: add a path_conflict field to merge_options_internalElijah Newren2020-12-131-0/+7
| * | | | | merge-ort: add a clear_internal_opts helperElijah Newren2020-12-131-16/+24
| * | | | | merge-ort: add a few includesElijah Newren2020-12-131-0/+2
* | | | | | Merge branch 'en/merge-ort-impl'Junio C Hamano2021-01-074-5/+1256
|\| | | | |
| * | | | | merge-ort: free data structures in merge_finalize()Elijah Newren2020-12-131-1/+31