Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | checkout: fix nested sparse directory diff in sparse index | Victoria Dye | 2022-08-08 | 1 | -0/+8 |
* | Merge branch 'll/ls-files-tests-update' into maint | Junio C Hamano | 2022-07-27 | 5 | -71/+132 |
|\ | |||||
| * | ls-files: update test style | Li Linchao | 2022-07-06 | 5 | -71/+132 |
* | | Merge branch 'ds/t5510-brokequote' into maint | Junio C Hamano | 2022-07-27 | 1 | -1/+5 |
|\ \ | |||||
| * | | t5510: replace 'origin' with URL more carefully | Derrick Stolee | 2022-06-21 | 1 | -1/+5 |
* | | | Merge branch 'en/t6429-test-must-be-empty-fix' into maint | Junio C Hamano | 2022-07-27 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | t6429: fix use of non-existent function | Elijah Newren | 2022-07-01 | 1 | -1/+1 |
* | | | | Merge branch 'ab/test-quoting-fix' into maint | Junio C Hamano | 2022-07-27 | 5 | -7/+8 |
|\ \ \ \ | |||||
| * | | | | config tests: fix harmless but broken "rm -r" cleanup | Ævar Arnfjörð Bjarmason | 2022-06-30 | 1 | -2/+3 |
| * | | | | test-lib.sh: fix prepend_var() quoting issue | Ævar Arnfjörð Bjarmason | 2022-06-30 | 1 | -2/+2 |
| * | | | | tests: add missing double quotes to included library paths | Ævar Arnfjörð Bjarmason | 2022-06-30 | 3 | -3/+3 |
* | | | | | Merge branch 'gg/worktree-from-the-above' into maint | Junio C Hamano | 2022-07-27 | 1 | -0/+265 |
|\ \ \ \ \ | |||||
| * | | | | | dir: traverse into repository | Goss Geppert | 2022-06-22 | 1 | -0/+265 |
* | | | | | | Merge branch 'en/merge-dual-dir-renames-fix' into maint | Junio C Hamano | 2022-07-27 | 1 | -0/+105 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge-ort: fix issue with dual rename and add/add conflict | Elijah Newren | 2022-07-06 | 1 | -2/+2 |
| * | | | | | | t6423: add tests of dual directory rename plus add/add conflict | Elijah Newren | 2022-07-06 | 1 | -0/+105 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'js/ci-github-workflow-markup' into maint | Junio C Hamano | 2022-07-27 | 1 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tests: fix incorrect --write-junit-xml code | Johannes Schindelin | 2022-07-14 | 1 | -5/+5 |
* | | | | | | | Merge 'js/add-i-delete' into maint-2.37 | Junio C Hamano | 2022-07-04 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add --interactive: allow `update` to stage deleted files | Johannes Schindelin | 2022-06-29 | 1 | -0/+9 |
* | | | | | | | | Sync with Git 2.36.2 | Junio C Hamano | 2022-06-27 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Sync with 2.35.4 | Johannes Schindelin | 2022-06-23 | 2 | -0/+108 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | Sync with 2.34.4 | Johannes Schindelin | 2022-06-23 | 2 | -0/+108 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Sync with 2.33.4 | Johannes Schindelin | 2022-06-23 | 2 | -0/+108 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Sync with 2.32.3 | Johannes Schindelin | 2022-06-23 | 2 | -0/+108 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Sync with 2.31.4 | Johannes Schindelin | 2022-06-23 | 2 | -0/+108 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | Sync with 2.30.5 | Johannes Schindelin | 2022-06-23 | 2 | -0/+108 |
| | | | | | |\ \ \ \ \ \ | |||||
| * | | | | | \ \ \ \ \ \ | Merge branch 'ah/rebase-keep-base-fix' into maint | Junio C Hamano | 2022-06-08 | 1 | -0/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pw/test-malloc-with-sanitize-address' into maint | Junio C Hamano | 2022-06-08 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/commit-summary-wo-break-rewrite' into maint | Junio C Hamano | 2022-06-08 | 1 | -0/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/valgrind-fixes' into maint | Junio C Hamano | 2022-06-08 | 5 | -10/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/show-branch-g-current' into maint | Junio C Hamano | 2022-06-08 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jp/prompt-clear-before-upstream-mark' | Junio C Hamano | 2022-06-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | git-prompt: fix expansion of branch colour codes | Joakim Petersen | 2022-06-10 | 1 | -9/+9 |
| * | | | | | | | | | | | | | | | | | git-prompt: make colourization consistent | Joakim Petersen | 2022-06-07 | 1 | -9/+9 |
* | | | | | | | | | | | | | | | | | | Merge branch 'cb/path-owner-check-with-sudo-plus' | Junio C Hamano | 2022-06-18 | 1 | -14/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | git-compat-util: allow root to access both SUDO_UID and root owned | Carlo Marcelo Arenas Belón | 2022-06-17 | 1 | -14/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/bug-fl-va-list-fix' | Junio C Hamano | 2022-06-17 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | bug_fl(): correctly initialize trace2 va_list | Jeff King | 2022-06-16 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ab/credentials-in-url-more' | Junio C Hamano | 2022-06-17 | 2 | -12/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | transfer doc: move fetch.credentialsInUrl to "transfer" config namespace | Ævar Arnfjörð Bjarmason | 2022-06-15 | 2 | -12/+12 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'ds/more-test-coverage' | Junio C Hamano | 2022-06-17 | 2 | -7/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | t5329: test 'git gc --cruft' without '--prune=now' | Derrick Stolee | 2022-06-16 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | | t2107: test 'git update-index --verbose' | Derrick Stolee | 2022-06-16 | 1 | -6/+25 |
| |/ / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/perf-lib-test-titles' | Junio C Hamano | 2022-06-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | perf-lib: fix missing test titles in output | Jeff King | 2022-06-16 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/revert-show-parent-info' | Junio C Hamano | 2022-06-16 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | revert: --reference should apply only to 'revert', not 'cherry-pick' | Junio C Hamano | 2022-05-31 | 1 | -0/+6 |
| * | | | | | | | | | | | | | | | | | | | | revert: optionally refer to commit in the "reference" format | Junio C Hamano | 2022-05-27 | 1 | -0/+31 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | tests: add LIBCURL prerequisite to tests needing libcurl | Ævar Arnfjörð Bjarmason | 2022-06-15 | 4 | -5/+6 |