Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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-17 | 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-15 | 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-26 | 1 | -0/+31 |
* | | | | | | | tests: add LIBCURL prerequisite to tests needing libcurl | Ævar Arnfjörð Bjarmason | 2022-06-15 | 4 | -5/+6 |
* | | | | | | | add -i tests: mark "TODO" depending on GIT_TEST_ADD_I_USE_BUILTIN | Ævar Arnfjörð Bjarmason | 2022-06-15 | 3 | -3/+15 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge branch 'gc/document-config-worktree-scope' | Junio C Hamano | 2022-06-13 | 1 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: document and test the 'worktree' scope | Glen Choo | 2022-06-07 | 1 | -0/+9 |
* | | | | | | | Merge branch 'ds/credentials-in-url' | Junio C Hamano | 2022-06-13 | 2 | -0/+55 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remote: create fetch.credentialsInUrl config | Derrick Stolee | 2022-06-06 | 2 | -0/+55 |
* | | | | | | | | Merge branch 'jt/unparse-commit-upon-graft-change' | Junio C Hamano | 2022-06-13 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit,shallow: unparse commits if grafts changed | Jonathan Tan | 2022-06-06 | 1 | -0/+12 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ab/hooks-regression-fix' | Junio C Hamano | 2022-06-13 | 3 | -3/+80 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | hook API: fix v2.36.0 regression: hooks should be connected to a TTY | Ævar Arnfjörð Bjarmason | 2022-06-07 | 1 | -0/+31 |
| * | | | | | | | | run-command: add an "ungroup" option to run_process_parallel() | Ævar Arnfjörð Bjarmason | 2022-06-07 | 2 | -3/+49 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'tl/ls-tree-oid-only' | Junio C Hamano | 2022-06-13 | 3 | -3/+204 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ls-tree: test for the regression in 9c4d58ff2c3 | Ævar Arnfjörð Bjarmason | 2022-06-03 | 3 | -3/+204 |
* | | | | | | | | | Merge branch 'pb/range-diff-with-submodule' | Junio C Hamano | 2022-06-13 | 1 | -0/+51 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | range-diff: show submodule changes irrespective of diff.submodule | Philippe Blain | 2022-06-06 | 1 | -0/+51 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ab/bug-if-bug' | Junio C Hamano | 2022-06-10 | 2 | -2/+103 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | usage.c: add a non-fatal bug() function to go with BUG() | Ævar Arnfjörð Bjarmason | 2022-06-02 | 2 | -2/+103 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jy/gitweb-xhtml5' | Junio C Hamano | 2022-06-10 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | gitweb: switch to an XHTML5 DOCTYPE | Jason Yundt | 2022-06-02 | 1 | -0/+14 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jh/builtin-fsmonitor-part3' | Junio C Hamano | 2022-06-10 | 8 | -4/+986 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t7527: improve implicit shutdown testing in fsmonitor--daemon | Jeff Hostetler | 2022-05-26 | 1 | -14/+40 |
| * | | | | | | | | fsmonitor--daemon: allow --super-prefix argument | Jeff Hostetler | 2022-05-26 | 1 | -0/+50 |
| * | | | | | | | | t7527: test Unicode NFC/NFD handling on MacOS | Jeff Hostetler | 2022-05-26 | 1 | -0/+55 |
| * | | | | | | | | t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd | Jeff Hostetler | 2022-05-26 | 1 | -0/+162 |
| * | | | | | | | | t/helper/hexdump: add helper to print hexdump of stdin | Jeff Hostetler | 2022-05-26 | 3 | -0/+32 |
| * | | | | | | | | t7527: test FSMonitor on case insensitive+preserving file system | Jeff Hostetler | 2022-05-26 | 1 | -0/+36 |
| * | | | | | | | | fsmonitor: never set CE_FSMONITOR_VALID on submodules | Jeff Hostetler | 2022-05-26 | 1 | -0/+111 |
| * | | | | | | | | t/perf/p7527: add perf test for builtin FSMonitor | Jeff Hostetler | 2022-05-26 | 1 | -0/+257 |
| * | | | | | | | | t7527: FSMonitor tests for directory moves | Jeff Hostetler | 2022-05-26 | 1 | -0/+27 |
| * | | | | | | | | fsmonitor-settings: VFS for Git virtual repos are incompatible | Jeff Hostetler | 2022-05-26 | 1 | -0/+9 |
| * | | | | | | | | fsmonitor-settings: bare repos are incompatible with FSMonitor | Jeff Hostetler | 2022-05-26 | 1 | -0/+23 |
| * | | | | | | | | t/helper/fsmonitor-client: create stress test | Jeff Hostetler | 2022-05-26 | 1 | -0/+106 |
| * | | | | | | | | t7527: test FSMonitor on repos with Unicode root paths | Jeff Hostetler | 2022-05-26 | 1 | -0/+23 |