Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | branch: error code with --edit-description | Rubén Justo | 2022-10-26 | 2 | -2/+2 |
* | Sync with 'maint' | Junio C Hamano | 2022-10-26 | 2 | -19/+47 |
|\ | |||||
| * | Downmerge a handful of topics for 2.38.2 | Junio C Hamano | 2022-10-25 | 2 | -1/+48 |
| * | Merge branch 'jk/cleanup-callback-parameters' into maint-2.38 | Junio C Hamano | 2022-10-25 | 4 | -57/+17 |
| |\ | |||||
| * \ | Merge branch 'rs/gc-pack-refs-simplify' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -9/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'nb/doc-mergetool-typofix' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/sequencer-missing-author-name-check' into maint-2.38 | Junio C Hamano | 2022-10-25 | 2 | -1/+60 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ds/bundle-uri-docfix' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -4/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ab/test-malloc-with-sanitize-leak' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -1/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rs/bisect-start-leakfix' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -4/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/branch-description-unset' into maint-2.38 | Junio C Hamano | 2022-10-25 | 2 | -2/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'pw/ssh-sign-report-errors' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'pw/mailinfo-b-fix' into maint-2.38 | Junio C Hamano | 2022-10-25 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/test-httpd-in-C-locale' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/merge-ort-in-read-only-repo' into maint-2.38 | Junio C Hamano | 2022-10-25 | 2 | -34/+69 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ja/rebase-i-avoid-amending-self' into maint-2.38 | Junio C Hamano | 2022-10-25 | 2 | -2/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fsck-on-diet' into maint-2.38 | Junio C Hamano | 2022-10-25 | 2 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/fsmonitor-daemon-usage-non-l10n' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/clone-allow-bare-and-o-together' into maint-2.38 | Junio C Hamano | 2022-10-25 | 2 | -7/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/remote-rename-without-fetch-refspec' into maint-2.38 | Junio C Hamano | 2022-10-25 | 2 | -23/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vd/fix-unaligned-read-index-v4' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -19/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/coding-guidelines-c99' into maint-2.38 | Junio C Hamano | 2022-10-25 | 2 | -17/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | The sixth batch | Junio C Hamano | 2022-10-25 | 1 | -0/+14 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/more-sanitizer-at-ci' | Junio C Hamano | 2022-10-25 | 2 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | ci: add address and undefined sanitizer tasks | Junio C Hamano | 2022-10-20 | 2 | -0/+12 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/ci-osx-with-sha1dc' | Junio C Hamano | 2022-10-25 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | ci: use DC_SHA1=YesPlease on osx-clang job for CI | Junio C Hamano | 2022-10-20 | 1 | -0/+2 |
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gc/bare-repo-discovery' | Junio C Hamano | 2022-10-25 | 3 | -22/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | config: respect includes in protected config | Glen Choo | 2022-10-13 | 3 | -22/+26 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-caret-bang-with-parents' | Junio C Hamano | 2022-10-25 | 5 | -13/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | diff: support ^! for merges | René Scharfe | 2022-10-01 | 3 | -9/+32 |
| * | | | | | | | | | | | | | | | | | | | | | | | revisions.txt: unspecify order of resolved parts of ^! | René Scharfe | 2022-10-01 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | revision: use strtol_i() for exclude_parent | René Scharfe | 2022-10-01 | 1 | -3/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | The fifth batch | Junio C Hamano | 2022-10-21 | 1 | -1/+21 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/branch-edit-description-with-nth-checkout' | Junio C Hamano | 2022-10-21 | 2 | -19/+58 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | branch: support for shortcuts like @{-1}, completed | Rubén Justo | 2022-10-10 | 2 | -19/+58 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ds/cmd-main-reorder' | Junio C Hamano | 2022-10-21 | 1 | -6/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | git.c: improve code readability in cmd_main() | Daniel Sonbolian | 2022-10-08 | 1 | -6/+8 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/grep-simplify-extended-expression' | Junio C Hamano | 2022-10-21 | 3 | -9/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | grep.c: remove "extended" in favor of "pattern_expression", fix segfault | Ævar Arnfjörð Bjarmason | 2022-10-11 | 3 | -9/+16 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/symbolic-ref-no-recurse' | Junio C Hamano | 2022-10-21 | 3 | -8/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | symbolic-ref: teach "--[no-]recurse" option | Junio C Hamano | 2022-10-09 | 3 | -8/+35 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/use-o0-in-leak-sanitizer' | Junio C Hamano | 2022-10-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: force -O0 when compiling with SANITIZE=leak | Jeff King | 2022-10-19 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/macos-build-fix-with-sha1dc' | Junio C Hamano | 2022-10-21 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fsmonitor OSX: compile with DC_SHA1=YesPlease | Ævar Arnfjörð Bjarmason | 2022-10-19 | 1 | -5/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fourth batch | Junio C Hamano | 2022-10-19 | 1 | -0/+9 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/struct-zero-init-with-older-clang' | Junio C Hamano | 2022-10-19 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.mak.dev: disable suggest braces error on old clang versions | Jeff Hostetler | 2022-10-10 | 1 | -0/+25 |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/archive-dedup-printf' | Junio C Hamano | 2022-10-19 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |