summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge branch 'rs/external-diff-with-exit-code'Junio C Hamano2024-05-153-3/+47
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | diff: fix --exit-code with external diffRené Scharfe2024-05-062-3/+38
| * | | | | diff: report unmerged paths as changes in run_diff_cmd()René Scharfe2024-05-062-0/+9
* | | | | | Merge branch 'jt/port-ci-whitespace-check-to-gitlab'Junio C Hamano2024-05-154-64/+109
|\ \ \ \ \ \
| * | | | | | gitlab-ci: add whitespace error checkJustin Tobler2024-05-031-0/+9
| * | | | | | ci: make the whitespace report optionalJustin Tobler2024-05-031-12/+33
| * | | | | | ci: separate whitespace check scriptJustin Tobler2024-05-032-64/+78
| * | | | | | github-ci: fix link to whitespace errorJustin Tobler2024-05-031-11/+12
| * | | | | | ci: pre-collapse GitLab CI sectionsJustin Tobler2024-05-031-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ow/refspec-glossary-update'Junio C Hamano2024-05-151-1/+2
|\ \ \ \ \ \
| * | | | | | Documentation: Mention that refspecs are explained elsewhereØystein Walle2024-05-061-1/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jp/tag-trailer'Junio C Hamano2024-05-156-28/+181
|\ \ \ \ \ \
| * | | | | | builtin/tag: add --trailer optionJohn Passaro2024-05-073-11/+157
| * | | | | | builtin/commit: refactor --trailer logicJohn Passaro2024-05-073-8/+23
| * | | | | | builtin/commit: use ARGV macro to collect trailersJohn Passaro2024-05-071-9/+1
| |/ / / / /
* | | | | | Merge branch 'ps/config-subcommands'Junio C Hamano2024-05-156-370/+812
|\ \ \ \ \ \
| * | | | | | builtin/config: display subcommand helpPatrick Steinhardt2024-05-062-3/+3
| * | | | | | builtin/config: introduce "edit" subcommandPatrick Steinhardt2024-05-063-36/+68
| * | | | | | builtin/config: introduce "remove-section" subcommandPatrick Steinhardt2024-05-063-6/+41
| * | | | | | builtin/config: introduce "rename-section" subcommandPatrick Steinhardt2024-05-063-15/+50
| * | | | | | builtin/config: introduce "unset" subcommandPatrick Steinhardt2024-05-063-26/+84
| * | | | | | builtin/config: introduce "set" subcommandPatrick Steinhardt2024-05-063-63/+140
| * | | | | | builtin/config: introduce "get" subcommandPatrick Steinhardt2024-05-063-99/+194
| * | | | | | builtin/config: introduce "list" subcommandPatrick Steinhardt2024-05-063-64/+162
| * | | | | | builtin/config: pull out function to handle `--null`Patrick Steinhardt2024-05-061-6/+9
| * | | | | | builtin/config: pull out function to handle config locationPatrick Steinhardt2024-05-061-65/+68
| * | | | | | builtin/config: use `OPT_CMDMODE()` to specify modesPatrick Steinhardt2024-05-062-18/+27
| * | | | | | builtin/config: move "fixed-value" option to correct groupPatrick Steinhardt2024-05-061-1/+1
| * | | | | | builtin/config: move option array aroundPatrick Steinhardt2024-05-061-48/+48
| * | | | | | config: clarify memory ownership when preparing comment stringsPatrick Steinhardt2024-05-063-16/+13
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/unit-test-suite-runner'Junio C Hamano2024-05-1511-30/+74
|\ \ \ \ \ \
| * | | | | | cmake: let `test-tool` run the unit tests, tooJohannes Schindelin2024-05-061-1/+2
| * | | | | | ci: use test-tool as unit test runner on WindowsJosh Steadmon2024-05-061-1/+1
| * | | | | | t/Makefile: run unit tests alongside shell testsJeff King2024-05-063-3/+19
| * | | | | | unit tests: add rule for running with test-toolJosh Steadmon2024-05-062-2/+10
| * | | | | | test-tool run-command testsuite: support unit testsJosh Steadmon2024-05-061-3/+14
| * | | | | | test-tool run-command testsuite: remove hardcoded filterJosh Steadmon2024-05-061-3/+1
| * | | | | | test-tool run-command testsuite: get shell from envJosh Steadmon2024-05-061-1/+8
| * | | | | | t0080: turn t-basic unit test into a helperJosh Steadmon2024-05-066-17/+20
| * | | | | | Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runnerJunio C Hamano2024-02-032-8/+12
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Sync with Git 2.45.1Junio C Hamano2024-05-1443-86/+1283
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 2.45.1v2.45.1Johannes Schindelin2024-04-293-2/+10
| * | | | | | | | Sync with 2.44.1Johannes Schindelin2024-04-2942-86/+1275
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Git 2.44.1v2.44.1Johannes Schindelin2024-04-193-2/+10
| | * | | | | | | Sync with 2.43.4Johannes Schindelin2024-04-1945-87/+1281
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Git 2.43.4v2.43.4Johannes Schindelin2024-04-193-2/+9
| | | * | | | | | Sync with 2.42.2Johannes Schindelin2024-04-1946-107/+1294
| | | |\ \ \ \ \ \
| | | | * | | | | | Git 2.42.2v2.42.2Johannes Schindelin2024-04-193-2/+9
| | | | * | | | | | Sync with 2.41.1Johannes Schindelin2024-04-1946-114/+1292
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Git 2.41.1v2.41.1Johannes Schindelin2024-04-193-2/+9