summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/t5351-freebsd-fix'Junio C Hamano2022-08-081-3/+9
|\
| * t5351: avoid using `test_cmp` for binary dataJohannes Schindelin2022-07-291-1/+1
| * t5351: avoid relying on `core.fsyncMethod = batch` to be supportedJohannes Schindelin2022-07-291-2/+8
* | Merge branch 'tb/cat-file-z'Junio C Hamano2022-08-061-15/+57
|\ \
| * | builtin/cat-file.c: support NUL-delimited input with `-z`Taylor Blau2022-07-231-1/+41
| * | t1006: extract --batch-command inputs to variablesTaylor Blau2022-07-231-14/+16
* | | Merge branch 'en/merge-restore-to-pristine'Junio C Hamano2022-08-034-1/+99
|\ \ \
| * | | merge: do not exit restore_state() prematurelyElijah Newren2022-07-231-0/+32
| * | | merge: make restore_state() restore staged state tooElijah Newren2022-07-231-1/+6
| * | | merge: fix save_state() to work when there are stat-dirty filesElijah Newren2022-07-231-0/+11
| * | | merge: do not abort early if one strategy fails to handle the mergeElijah Newren2022-07-233-1/+18
| * | | merge: abort if index does not match HEAD for trivial mergesElijah Newren2022-07-231-1/+21
| * | | merge-resolve: abort if index does not match HEADElijah Newren2022-07-231-0/+13
* | | | Merge branch 'rs/mergesort'Junio C Hamano2022-08-033-30/+10
|\ \ \ \
| * | | | test-mergesort: use DEFINE_LIST_SORTRené Scharfe2022-07-182-14/+5
| * | | | test-mergesort: use DEFINE_LIST_SORT_DEBUGRené Scharfe2022-07-182-16/+5
* | | | | Merge branch 'sa/cat-file-mailmap'Junio C Hamano2022-08-031-0/+59
|\ \ \ \ \
| * | | | | cat-file: add mailmap supportSiddharth Asthana2022-07-181-0/+59
* | | | | | Merge branch 'zh/ls-files-format'Junio C Hamano2022-08-031-0/+95
|\ \ \ \ \ \
| * | | | | | ls-files: introduce "--format" optionZheNing Hu2022-07-231-0/+95
* | | | | | | Merge branch 'tb/commit-graph-genv2-upgrade-fix'Junio C Hamano2022-08-031-0/+27
|\ \ \ \ \ \ \
| * | | | | | | commit-graph: fix corrupt upgrade from generation v1 to v2Taylor Blau2022-07-161-1/+1
| * | | | | | | t5318: demonstrate commit-graph generation v2 corruptionTaylor Blau2022-07-161-0/+27
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'tk/untracked-cache-with-uall'Junio C Hamano2022-08-031-0/+5
|\ \ \ \ \ \ \
| * | | | | | | read-cache: make `do_read_index()` always set up `istate->repo`Martin Ågren2022-07-221-0/+5
* | | | | | | | Merge branch 'mt/checkout-count-fix'Junio C Hamano2022-08-013-1/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: fix two bugs on the final count of updated entriesMatheus Tavares2022-07-142-2/+2
| * | | | | | | | checkout: show bug about failed entries being included in final reportMatheus Tavares2022-07-142-1/+53
| * | | | | | | | checkout: document bug where delayed checkout counts entries twiceMatheus Tavares2022-07-141-0/+22
* | | | | | | | | Merge branch 'ds/rebase-update-ref'Junio C Hamano2022-08-013-26/+365
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | sequencer: notify user of --update-refs activityDerrick Stolee2022-07-191-4/+33
| * | | | | | | | rebase: add rebase.updateRefs config optionDerrick Stolee2022-07-191-0/+14
| * | | | | | | | sequencer: rewrite update-refs as user edits todo listDerrick Stolee2022-07-192-0/+154
| * | | | | | | | rebase: update refs from 'update-ref' commandsDerrick Stolee2022-07-192-15/+23
| * | | | | | | | rebase: add --update-refs optionDerrick Stolee2022-07-192-0/+96
| * | | | | | | | branch: consider refs under 'update-refs'Derrick Stolee2022-07-191-0/+23
| * | | | | | | | t2407: test branches currently using apply backendDerrick Stolee2022-07-191-1/+11
| * | | | | | | | t2407: test bisect and rebase as black-boxesDerrick Stolee2022-07-191-26/+31
| * | | | | | | | Merge branch 'ds/branch-checked-out' into ds/rebase-update-refJunio C Hamano2022-07-121-0/+129
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ds/doc-wo-whitelist'Junio C Hamano2022-07-275-9/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t: avoid "whitelist"Derrick Stolee2022-07-194-8/+7
| * | | | | | | | | git-cvsserver: clarify directory listDerrick Stolee2022-07-191-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mb/config-document-include'Junio C Hamano2022-07-271-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config.txt: document include, includeIfManuel Boni2022-07-171-0/+13
* | | | | | | | | | Merge branch 'ma/t4200-update'Junio C Hamano2022-07-271-3/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t4200: drop irrelevant codeMartin Ågren2022-07-181-3/+0
* | | | | | | | | | | Merge branch 'ab/squelch-empty-fsync-traces'Junio C Hamano2022-07-272-7/+34
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | trace2: only include "fsync" events if we git_fsync()Ævar Arnfjörð Bjarmason2022-07-182-7/+34
* | | | | | | | | | | Merge branch 'js/ci-github-workflow-markup'Junio C Hamano2022-07-231-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tests: fix incorrect --write-junit-xml codeJohannes Schindelin2022-07-141-5/+5