summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* usage.c: add a non-fatal bug() function to go with BUG()Ævar Arnfjörð Bjarmason2022-06-022-2/+103
* Merge branch 'js/use-builtin-add-i'Junio C Hamano2022-05-312-21/+23
|\
| * add -i: default to the built-in implementationJohannes Schindelin2021-12-012-2/+2
| * t2016: require the PERL prereq only when necessaryJohannes Schindelin2021-12-011-20/+22
* | Merge branch 'jc/t6424-failing-merge-preserve-local-changes'Junio C Hamano2022-05-311-2/+30
|\ \
| * | t6424: make sure a failed merge preserves local changesJunio C Hamano2022-05-191-2/+30
* | | Merge branch 'cc/http-curlopt-resolve'Junio C Hamano2022-05-311-0/+7
|\ \ \
| * | | http: add custom hostname to IP address resolutionsChristian Couder2022-05-161-0/+7
* | | | Merge branch 'ac/remote-v-with-object-list-filters'Junio C Hamano2022-05-261-0/+34
|\ \ \ \
| * | | | builtin/remote.c: teach `-v` to list filters for promisor remotesAbhradeep Chakraborty2022-05-091-0/+34
| |/ / /
* | | | Merge branch 'cb/path-owner-check-with-sudo'Junio C Hamano2022-05-262-0/+121
|\ \ \ \
| * | | | t0034: add negative tests and allow git init to mostly work under sudoCarlo Marcelo Arenas Belón2022-05-132-0/+77
| * | | | git-compat-util: avoid failing dir ownership checks if running privilegedCarlo Marcelo Arenas Belón2022-05-131-1/+1
| * | | | t: regression git needs safe.directory when using sudoCarlo Marcelo Arenas Belón2022-05-131-0/+44
* | | | | Merge branch 'tk/simple-autosetupmerge'Junio C Hamano2022-05-263-4/+125
|\ \ \ \ \
| * | | | | push: new config option "push.autoSetupRemote" supports "simple" pushTao Klerks2022-04-291-0/+14
| * | | | | push: default to single remote even when not named originTao Klerks2022-04-292-4/+76
| * | | | | branch: new autosetupmerge option 'simple' for matching branchesTao Klerks2022-04-291-0/+35
* | | | | | Merge branch 'jc/avoid-redundant-submodule-fetch'Junio C Hamano2022-05-261-0/+27
|\ \ \ \ \ \
| * | | | | | fetch: do not run a redundant fetch from submoduleJunio C Hamano2022-05-181-0/+27
* | | | | | | Merge branch 'jc/show-branch-g-current'Junio C Hamano2022-05-261-0/+14
|\ \ \ \ \ \ \
| * | | | | | | show-branch: -g and --current are incompatibleJunio C Hamano2022-04-211-0/+14
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ab/valgrind-fixes'Junio C Hamano2022-05-235-10/+29
|\ \ \ \ \ \ \
| * | | | | | | object-file: fix a unpack_loose_header() regression in 3b6a8db3b03Ævar Arnfjörð Bjarmason2022-05-132-4/+19
| * | | | | | | log test: skip a failing mkstemp() test under valgrindÆvar Arnfjörð Bjarmason2022-05-131-4/+7
| * | | | | | | tests: using custom GIT_EXEC_PATH breaks --valgrind testsÆvar Arnfjörð Bjarmason2022-05-132-2/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ab/commit-plug-leaks'Junio C Hamano2022-05-232-0/+2
|\ \ \ \ \ \ \
| * | | | | | | commit: fix "author_ident" leakJunio C Hamano2022-05-132-0/+2
* | | | | | | | Merge branch 'tk/p4-metadata-coding-strategies'Junio C Hamano2022-05-213-1/+429
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: improve encoding handling to support inconsistent encodingsTao Klerks2022-05-043-1/+429
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ds/sparse-colon-path'Junio C Hamano2022-05-211-0/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | rev-parse: integrate with sparse indexDerrick Stolee2022-04-261-20/+25
| * | | | | | | | object-name: diagnose trees in index properlyDerrick Stolee2022-04-261-6/+12
| * | | | | | | | object-name: reject trees found in the indexDerrick Stolee2022-04-261-9/+2
| * | | | | | | | show: integrate with the sparse indexDerrick Stolee2022-04-261-4/+20
| * | | | | | | | t1092: add compatibility tests for 'git show'Derrick Stolee2022-04-261-0/+16
| |/ / / / / / /
* | | | | | | | Merge branch 'vd/sparse-stash'Junio C Hamano2022-05-212-1/+79
|\ \ \ \ \ \ \ \
| * | | | | | | | unpack-trees: preserve index sparsityVictoria Dye2022-05-111-1/+1
| * | | | | | | | stash: apply stash using 'merge_ort_nonrecursive()'Victoria Dye2022-05-111-2/+2
| * | | | | | | | read-cache: set sparsity when index is newVictoria Dye2022-05-111-1/+1
| * | | | | | | | stash: integrate with sparse indexVictoria Dye2022-05-111-1/+28
| * | | | | | | | stash: expand sparse-checkout compatibility testingVictoria Dye2022-05-112-0/+51
| |/ / / / / / /
* | | | | | | | Merge branch 'cd/bisect-messages-from-pre-flight-states'Junio C Hamano2022-05-211-0/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | bisect: output bisect setup status in bisect logChris Down2022-05-111-0/+10
| * | | | | | | | bisect: output state before we are ready to compute bisectionChris Down2022-05-111-0/+18
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'rs/format-patch-pathspec-fix' into maintJunio C Hamano2022-05-051-2/+31
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/fast-export-pathspec-fix' into maintJunio C Hamano2022-05-051-0/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/show-pathspec-fix' into maintJunio C Hamano2022-05-051-0/+19
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-tree-stdin-fix' into maintJunio C Hamano2022-05-051-0/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'gc/submodule-update-part2' into maintJunio C Hamano2022-05-051-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |