summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'rs/parse-opt-forbid-set-int-0-without-noneg'Junio C Hamano2023-08-141-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | parse-options: disallow negating OPTION_SET_INT 0René Scharfe2023-08-091-0/+3
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ob/rebase-conflict-advice-i18n-fix'Junio C Hamano2023-08-141-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | advice: handle "rebase" in error_resolve_conflict()Oswald Buddenhagen2023-08-071-2/+3
| |/ / / / / / / / /
* | | | | | | | | | Git 2.42-rc1v2.42.0-rc1Junio C Hamano2023-08-102-1/+21
* | | | | | | | | | Merge branch 'pw/rebase-skip-commit-message-fix'Junio C Hamano2023-08-104-39/+93
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase --skip: fix commit message clean up when skipping squashPhillip Wood2023-08-034-39/+93
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ma/locate-in-path-for-windows'Junio C Hamano2023-08-104-3/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | docs: update when `git bisect visualize` uses `gitk`Matthias Aßhauer2023-08-041-3/+8
| * | | | | | | | | | compat/mingw: implement a native locate_in_PATH()Matthias Aßhauer2023-08-042-0/+8
| * | | | | | | | | | run-command: conditionally define locate_in_PATH()Matthias Aßhauer2023-08-041-0/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bc/ignore-clangd-cache'Junio C Hamano2023-08-101-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitignore: ignore clangd .cache directorybrian m. carlson2023-08-041-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bc/ident-dot-is-no-longer-crud-letter'Junio C Hamano2023-08-103-4/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ident: don't consider '.' a crudbrian m. carlson2023-08-023-4/+12
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ew/hash-with-openssl-evp'Junio C Hamano2023-08-104-2/+120
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | avoid SHA-1 functions deprecated in OpenSSL 3+Eric Wong2023-08-013-1/+63
| * | | | | | | | | sha256: avoid functions deprecated in OpenSSL 3+Eric Wong2023-08-013-1/+57
| |/ / / / / / / /
* | | | | | | | | A few more topics before -rc1Junio C Hamano2023-08-071-0/+8
* | | | | | | | | mailmap: change primary address for Glen ChooGlen Choo2023-08-071-0/+1
* | | | | | | | | Merge branch 'ew/sha256-gcrypt-leak-fixes'Junio C Hamano2023-08-071-5/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha256/gcrypt: die on gcry_md_open failuresEric Wong2023-07-311-1/+3
| * | | | | | | | | sha256/gcrypt: fix memory leak with SHA-256 reposEric Wong2023-07-311-0/+1
| * | | | | | | | | sha256/gcrypt: fix build with SANITIZE=leakEric Wong2023-07-311-4/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rs/bundle-parseopt-cleanup'Junio C Hamano2023-08-072-23/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bundle: use OPT_PASSTHRU_ARGVRené Scharfe2023-07-312-23/+23
| |/ / / / / / / /
* | | | | | | | | Merge branch 'am/doc-sha256'Junio C Hamano2023-08-072-8/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: sha256 is no longer experimentalAdam Majer2023-07-312-8/+11
* | | | | | | | | | Merge branch 'tb/commit-graph-tests'Junio C Hamano2023-08-073-242/+224
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`Taylor Blau2023-07-241-8/+5
| * | | | | | | | | t5328: avoid top-level directory changesTaylor Blau2023-07-241-27/+27
| * | | | | | | | | t5318: avoid top-level directory changesTaylor Blau2023-07-241-206/+172
| * | | | | | | | | t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()`Taylor Blau2023-07-241-6/+15
| * | | | | | | | | t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directoriesTaylor Blau2023-07-241-3/+13
* | | | | | | | | | Git 2.42-rc0v2.42.0-rc0Junio C Hamano2023-08-042-1/+24
* | | | | | | | | | Merge branch 'jc/branch-in-use-error-message'Junio C Hamano2023-08-042-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch: update the message to refuse touching a branch in-useJunio C Hamano2023-07-222-6/+6
* | | | | | | | | | | Merge branch 'hy/blame-in-bare-with-contents'Junio C Hamano2023-08-042-1/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: allow --contents to work with bare repoHan Young2023-07-212-1/+12
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/parse-options-short-help'Junio C Hamano2023-08-044-7/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | short help: allow a gap smaller than USAGE_GAPJunio C Hamano2023-07-202-3/+4
| * | | | | | | | | | | remote: simplify "remote add --tags" help textJunio C Hamano2023-07-201-3/+2
| * | | | | | | | | | | short help: allow multi-line opthelpJunio C Hamano2023-07-203-1/+15
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/doc-sent-patch-now-what'Junio C Hamano2023-08-041-0/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MyFirstContribution: refrain from self-iterating too muchJunio C Hamano2023-07-281-0/+32
* | | | | | | | | | | | Merge branch 'la/doc-choose-starting-point-fixup'Junio C Hamano2023-08-041-4/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | SubmittingPatches: use of older maintenance tracks is an exceptionJunio C Hamano2023-07-271-6/+13
| * | | | | | | | | | | | SubmittingPatches: explain why 'next' and above are inappropriate baseJunio C Hamano2023-07-271-4/+8
| * | | | | | | | | | | | SubmittingPatches: choice of base for fixing an older maintenance trackJunio C Hamano2023-07-261-1/+6
* | | | | | | | | | | | | Merge branch 'pv/doc-submodule-update-settings'Junio C Hamano2023-08-042-15/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \