Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/t5351-freebsd-fix' | Junio C Hamano | 2022-08-08 | 1 | -3/+9 |
|\ | |||||
| * | t5351: avoid using `test_cmp` for binary data | Johannes Schindelin | 2022-07-29 | 1 | -1/+1 |
| * | t5351: avoid relying on `core.fsyncMethod = batch` to be supported | Johannes Schindelin | 2022-07-29 | 1 | -2/+8 |
* | | Merge branch 'tb/cat-file-z' | Junio C Hamano | 2022-08-06 | 1 | -15/+57 |
|\ \ | |||||
| * | | builtin/cat-file.c: support NUL-delimited input with `-z` | Taylor Blau | 2022-07-23 | 1 | -1/+41 |
| * | | t1006: extract --batch-command inputs to variables | Taylor Blau | 2022-07-23 | 1 | -14/+16 |
* | | | Merge branch 'en/merge-restore-to-pristine' | Junio C Hamano | 2022-08-03 | 4 | -1/+99 |
|\ \ \ | |||||
| * | | | merge: do not exit restore_state() prematurely | Elijah Newren | 2022-07-23 | 1 | -0/+32 |
| * | | | merge: make restore_state() restore staged state too | Elijah Newren | 2022-07-23 | 1 | -1/+6 |
| * | | | merge: fix save_state() to work when there are stat-dirty files | Elijah Newren | 2022-07-23 | 1 | -0/+11 |
| * | | | merge: do not abort early if one strategy fails to handle the merge | Elijah Newren | 2022-07-23 | 3 | -1/+18 |
| * | | | merge: abort if index does not match HEAD for trivial merges | Elijah Newren | 2022-07-23 | 1 | -1/+21 |
| * | | | merge-resolve: abort if index does not match HEAD | Elijah Newren | 2022-07-23 | 1 | -0/+13 |
* | | | | Merge branch 'rs/mergesort' | Junio C Hamano | 2022-08-03 | 3 | -30/+10 |
|\ \ \ \ | |||||
| * | | | | test-mergesort: use DEFINE_LIST_SORT | René Scharfe | 2022-07-18 | 2 | -14/+5 |
| * | | | | test-mergesort: use DEFINE_LIST_SORT_DEBUG | René Scharfe | 2022-07-18 | 2 | -16/+5 |
* | | | | | Merge branch 'sa/cat-file-mailmap' | Junio C Hamano | 2022-08-03 | 1 | -0/+59 |
|\ \ \ \ \ | |||||
| * | | | | | cat-file: add mailmap support | Siddharth Asthana | 2022-07-18 | 1 | -0/+59 |
* | | | | | | Merge branch 'zh/ls-files-format' | Junio C Hamano | 2022-08-03 | 1 | -0/+95 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ls-files: introduce "--format" option | ZheNing Hu | 2022-07-23 | 1 | -0/+95 |
* | | | | | | | Merge branch 'tb/commit-graph-genv2-upgrade-fix' | Junio C Hamano | 2022-08-03 | 1 | -0/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit-graph: fix corrupt upgrade from generation v1 to v2 | Taylor Blau | 2022-07-16 | 1 | -1/+1 |
| * | | | | | | | t5318: demonstrate commit-graph generation v2 corruption | Taylor Blau | 2022-07-16 | 1 | -0/+27 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'tk/untracked-cache-with-uall' | Junio C Hamano | 2022-08-03 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | read-cache: make `do_read_index()` always set up `istate->repo` | Martin Ågren | 2022-07-22 | 1 | -0/+5 |
* | | | | | | | | Merge branch 'mt/checkout-count-fix' | Junio C Hamano | 2022-08-01 | 3 | -1/+75 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout: fix two bugs on the final count of updated entries | Matheus Tavares | 2022-07-14 | 2 | -2/+2 |
| * | | | | | | | | checkout: show bug about failed entries being included in final report | Matheus Tavares | 2022-07-14 | 2 | -1/+53 |
| * | | | | | | | | checkout: document bug where delayed checkout counts entries twice | Matheus Tavares | 2022-07-14 | 1 | -0/+22 |
* | | | | | | | | | Merge branch 'ds/rebase-update-ref' | Junio C Hamano | 2022-08-01 | 3 | -26/+365 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | sequencer: notify user of --update-refs activity | Derrick Stolee | 2022-07-19 | 1 | -4/+33 |
| * | | | | | | | | rebase: add rebase.updateRefs config option | Derrick Stolee | 2022-07-19 | 1 | -0/+14 |
| * | | | | | | | | sequencer: rewrite update-refs as user edits todo list | Derrick Stolee | 2022-07-19 | 2 | -0/+154 |
| * | | | | | | | | rebase: update refs from 'update-ref' commands | Derrick Stolee | 2022-07-19 | 2 | -15/+23 |
| * | | | | | | | | rebase: add --update-refs option | Derrick Stolee | 2022-07-19 | 2 | -0/+96 |
| * | | | | | | | | branch: consider refs under 'update-refs' | Derrick Stolee | 2022-07-19 | 1 | -0/+23 |
| * | | | | | | | | t2407: test branches currently using apply backend | Derrick Stolee | 2022-07-19 | 1 | -1/+11 |
| * | | | | | | | | t2407: test bisect and rebase as black-boxes | Derrick Stolee | 2022-07-19 | 1 | -26/+31 |
| * | | | | | | | | Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref | Junio C Hamano | 2022-07-12 | 1 | -0/+129 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ds/doc-wo-whitelist' | Junio C Hamano | 2022-07-27 | 5 | -9/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t: avoid "whitelist" | Derrick Stolee | 2022-07-19 | 4 | -8/+7 |
| * | | | | | | | | | git-cvsserver: clarify directory list | Derrick Stolee | 2022-07-19 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'mb/config-document-include' | Junio C Hamano | 2022-07-27 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | config.txt: document include, includeIf | Manuel Boni | 2022-07-17 | 1 | -0/+13 |
* | | | | | | | | | | Merge branch 'ma/t4200-update' | Junio C Hamano | 2022-07-27 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t4200: drop irrelevant code | Martin Ågren | 2022-07-18 | 1 | -3/+0 |
* | | | | | | | | | | | Merge branch 'ab/squelch-empty-fsync-traces' | Junio C Hamano | 2022-07-27 | 2 | -7/+34 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | trace2: only include "fsync" events if we git_fsync() | Ævar Arnfjörð Bjarmason | 2022-07-18 | 2 | -7/+34 |
* | | | | | | | | | | | Merge branch 'js/ci-github-workflow-markup' | Junio C Hamano | 2022-07-23 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | tests: fix incorrect --write-junit-xml code | Johannes Schindelin | 2022-07-14 | 1 | -5/+5 |