summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* branch: error code with --edit-descriptionRubén Justo2022-10-262-2/+2
* Sync with 'maint'Junio C Hamano2022-10-262-19/+47
|\
| * Downmerge a handful of topics for 2.38.2Junio C Hamano2022-10-252-1/+48
| * Merge branch 'jk/cleanup-callback-parameters' into maint-2.38Junio C Hamano2022-10-254-57/+17
| |\
| * \ Merge branch 'rs/gc-pack-refs-simplify' into maint-2.38Junio C Hamano2022-10-251-9/+2
| |\ \
| * \ \ Merge branch 'nb/doc-mergetool-typofix' into maint-2.38Junio C Hamano2022-10-251-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jk/sequencer-missing-author-name-check' into maint-2.38Junio C Hamano2022-10-252-1/+60
| |\ \ \ \
| * \ \ \ \ Merge branch 'ds/bundle-uri-docfix' into maint-2.38Junio C Hamano2022-10-251-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ab/test-malloc-with-sanitize-leak' into maint-2.38Junio C Hamano2022-10-251-1/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/bisect-start-leakfix' into maint-2.38Junio C Hamano2022-10-251-4/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/branch-description-unset' into maint-2.38Junio C Hamano2022-10-252-2/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'pw/ssh-sign-report-errors' into maint-2.38Junio C Hamano2022-10-251-3/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'pw/mailinfo-b-fix' into maint-2.38Junio C Hamano2022-10-252-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/test-httpd-in-C-locale' into maint-2.38Junio C Hamano2022-10-251-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/merge-ort-in-read-only-repo' into maint-2.38Junio C Hamano2022-10-252-34/+69
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ja/rebase-i-avoid-amending-self' into maint-2.38Junio C Hamano2022-10-252-2/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fsck-on-diet' into maint-2.38Junio C Hamano2022-10-252-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/fsmonitor-daemon-usage-non-l10n' into maint-2.38Junio C Hamano2022-10-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/clone-allow-bare-and-o-together' into maint-2.38Junio C Hamano2022-10-252-7/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/remote-rename-without-fetch-refspec' into maint-2.38Junio C Hamano2022-10-252-23/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vd/fix-unaligned-read-index-v4' into maint-2.38Junio C Hamano2022-10-251-19/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/coding-guidelines-c99' into maint-2.38Junio C Hamano2022-10-252-17/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | The sixth batchJunio C Hamano2022-10-251-0/+14
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/more-sanitizer-at-ci'Junio C Hamano2022-10-252-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | ci: add address and undefined sanitizer tasksJunio C Hamano2022-10-202-0/+12
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/ci-osx-with-sha1dc'Junio C Hamano2022-10-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | ci: use DC_SHA1=YesPlease on osx-clang job for CIJunio C Hamano2022-10-201-0/+2
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'gc/bare-repo-discovery'Junio C Hamano2022-10-253-22/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | config: respect includes in protected configGlen Choo2022-10-133-22/+26
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-caret-bang-with-parents'Junio C Hamano2022-10-255-13/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | diff: support ^! for mergesRené Scharfe2022-10-013-9/+32
| * | | | | | | | | | | | | | | | | | | | | | | revisions.txt: unspecify order of resolved parts of ^!René Scharfe2022-10-011-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | revision: use strtol_i() for exclude_parentRené Scharfe2022-10-011-3/+2
* | | | | | | | | | | | | | | | | | | | | | | | The fifth batchJunio C Hamano2022-10-211-1/+21
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/branch-edit-description-with-nth-checkout'Junio C Hamano2022-10-212-19/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | branch: support for shortcuts like @{-1}, completedRubén Justo2022-10-102-19/+58
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ds/cmd-main-reorder'Junio C Hamano2022-10-211-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | git.c: improve code readability in cmd_main()Daniel Sonbolian2022-10-081-6/+8
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/grep-simplify-extended-expression'Junio C Hamano2022-10-213-9/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | grep.c: remove "extended" in favor of "pattern_expression", fix segfaultÆvar Arnfjörð Bjarmason2022-10-113-9/+16
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/symbolic-ref-no-recurse'Junio C Hamano2022-10-213-8/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | symbolic-ref: teach "--[no-]recurse" optionJunio C Hamano2022-10-093-8/+35
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/use-o0-in-leak-sanitizer'Junio C Hamano2022-10-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: force -O0 when compiling with SANITIZE=leakJeff King2022-10-191-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/macos-build-fix-with-sha1dc'Junio C Hamano2022-10-211-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fsmonitor OSX: compile with DC_SHA1=YesPleaseÆvar Arnfjörð Bjarmason2022-10-191-5/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | The fourth batchJunio C Hamano2022-10-191-0/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/struct-zero-init-with-older-clang'Junio C Hamano2022-10-191-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | config.mak.dev: disable suggest braces error on old clang versionsJeff Hostetler2022-10-101-0/+25
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/archive-dedup-printf'Junio C Hamano2022-10-191-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \