Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | object-name: explicitly handle OBJ_BAD in show_ambiguous_object() | Ævar Arnfjörð Bjarmason | 2022-01-27 | 1 | -1/+1 |
* | object-name tests: add tests for ambiguous object blind spots | Ævar Arnfjörð Bjarmason | 2022-01-27 | 1 | -0/+82 |
* | Merge branch 'ds/add-rm-with-sparse-index' | Junio C Hamano | 2021-11-23 | 1 | -0/+17 |
|\ | |||||
| * | dir: revert "dir: select directories correctly" | Derrick Stolee | 2021-11-22 | 1 | -0/+17 |
* | | Merge branch 'ev/pull-already-up-to-date-is-noop' | Junio C Hamano | 2021-11-22 | 1 | -0/+6 |
|\ \ | |||||
| * | | pull: should be noop when already-up-to-date | Erwin Villejo | 2021-11-18 | 1 | -0/+6 |
* | | | Merge branch 'hm/paint-hits-in-log-grep' | Junio C Hamano | 2021-11-22 | 1 | -48/+0 |
|\ \ \ | |||||
| * | | | Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data" | Junio C Hamano | 2021-11-19 | 1 | -48/+0 |
* | | | | Merge branch 'ab/fsck-unexpected-type' | Junio C Hamano | 2021-11-13 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | object-file: fix SEGV on free() regression in v2.34.0-rc2 | Ævar Arnfjörð Bjarmason | 2021-11-11 | 1 | -0/+8 |
* | | | | | Merge branch 'ps/connectivity-optim' | Junio C Hamano | 2021-11-13 | 1 | -31/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "connected: do not sort input revisions" | Junio C Hamano | 2021-11-11 | 1 | -31/+0 |
* | | | | | | Merge branch 'jk/ssh-signing-fix' | Junio C Hamano | 2021-11-11 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/lib-gpg: avoid broken versions of ssh-keygen | Jeff King | 2021-11-10 | 1 | -0/+6 |
* | | | | | | | Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date' | Junio C Hamano | 2021-11-11 | 1 | -1/+15 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | pull: --ff-only should make it a noop when already-up-to-date | Junio C Hamano | 2021-10-29 | 1 | -1/+15 |
* | | | | | | | Merge branch 'ad/ssh-signing-testfix' | Junio C Hamano | 2021-11-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t/lib-git.sh: fix ACL-related permissions failure | Adam Dinwoodie | 2021-11-05 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'ar/no-verify-doc' | Junio C Hamano | 2021-11-04 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Document positive variant of commit and merge option "--no-verify" | Alex Riesen | 2021-10-29 | 1 | -0/+8 |
* | | | | | | | | | Merge branch 'ar/fix-git-pull-no-verify' | Junio C Hamano | 2021-11-04 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pull: honor --no-verify and do not call the commit-msg hook | Alex Riesen | 2021-10-28 | 1 | -0/+24 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'pw/rebase-r-fixes' | Junio C Hamano | 2021-11-03 | 1 | -0/+29 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase -i: fix rewording with --committer-date-is-author-date | Phillip Wood | 2021-11-03 | 1 | -0/+29 |
* | | | | | | | | | | Merge branch 'ds/add-rm-with-sparse-index' | Junio C Hamano | 2021-11-03 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | dir: fix directory-matching bug | Derrick Stolee | 2021-11-03 | 1 | -0/+26 |
* | | | | | | | | | | Merge branch 'ab/test-lib' | Junio C Hamano | 2021-11-01 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t5310: drop lib-bundle.sh include | Jeff King | 2021-10-29 | 1 | -1/+0 |
* | | | | | | | | | | | Merge branch 'gc/use-repo-settings' | Junio C Hamano | 2021-11-01 | 4 | -7/+55 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | gc: perform incremental repack when implictly enabled | Glen Choo | 2021-10-15 | 1 | -4/+24 |
| * | | | | | | | | | | | fsck: verify multi-pack-index when implictly enabled | Glen Choo | 2021-10-15 | 1 | -1/+4 |
| * | | | | | | | | | | | fsck: verify commit graph when implicitly enabled | Glen Choo | 2021-10-15 | 2 | -2/+27 |
| * | | | | | | | | | | | Merge branch 'ab/ignore-replace-while-working-on-commit-graph' into gc/use-re... | Junio C Hamano | 2021-10-15 | 2 | -10/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/ignore-replace-while-working-on-commit-graph' | Junio C Hamano | 2021-11-01 | 2 | -10/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | commit-graph: don't consider "replace" objects with "verify" | Ævar Arnfjörð Bjarmason | 2021-10-15 | 1 | -0/+1 |
| * | | | | | | | | | | | | commit-graph tests: fix another graph_git_two_modes() helper | Ævar Arnfjörð Bjarmason | 2021-10-15 | 1 | -8/+12 |
| * | | | | | | | | | | | | commit-graph tests: fix error-hiding graph_git_two_modes() helper | Ævar Arnfjörð Bjarmason | 2021-10-15 | 1 | -2/+2 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'hm/paint-hits-in-log-grep' | Junio C Hamano | 2021-11-01 | 2 | -0/+99 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data | Hamza Mahfooz | 2021-10-15 | 1 | -0/+48 |
| * | | | | | | | | | | pretty: colorize pattern matches in commit messages | Hamza Mahfooz | 2021-10-08 | 1 | -0/+51 |
* | | | | | | | | | | | Merge branch 'mt/fix-add-rm-with-sparse-index' | Junio C Hamano | 2021-10-30 | 3 | -5/+73 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | add, rm, mv: fix bug that prevents the update of non-sparse dirs | Matheus Tavares | 2021-10-28 | 3 | -5/+73 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/log-warn-on-bogus-encoding' | Junio C Hamano | 2021-10-30 | 1 | -7/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Revert "logmsg_reencode(): warn when iconv() fails" | Junio C Hamano | 2021-10-29 | 1 | -7/+0 |
* | | | | | | | | | | | | Merge branch 'ab/plug-random-leaks' | Junio C Hamano | 2021-10-30 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | grep: fix a "path_list" memory leak | Ævar Arnfjörð Bjarmason | 2021-10-23 | 1 | -1/+2 |
* | | | | | | | | | | | | | Merge branch 'ab/plug-handle-path-exclude-leak' | Junio C Hamano | 2021-10-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | config.c: don't leak memory in handle_path_include() | Ævar Arnfjörð Bjarmason | 2021-10-22 | 1 | -0/+1 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'jk/http-push-status-fix' | Junio C Hamano | 2021-10-30 | 4 | -0/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | transport-helper: recognize "expecting report" error from send-pack | Jeff King | 2021-10-18 | 1 | -1/+1 |