summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | A few hotfixesJunio C Hamano2021-11-101-7/+20
* | | | | | | | | | | | | | | | | | Merge branch 'jk/ssh-signing-fix'Junio C Hamano2021-11-101-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t/lib-gpg: avoid broken versions of ssh-keygenJeff King2021-11-101-0/+6
* | | | | | | | | | | | | | | | | | | Merge branch 'js/simple-ipc-cygwin-socket-fix'Junio C Hamano2021-11-101-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | simple-ipc: work around issues with Cygwin's Unix socket emulationJohannes Schindelin2021-11-101-0/+22
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'ds/no-usable-cron-on-macos'Junio C Hamano2021-11-101-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | maintenance: disable cron on macOSDerrick Stolee2021-11-101-6/+21
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date'Junio C Hamano2021-11-102-2/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | pull: --ff-only should make it a noop when already-up-to-dateJunio C Hamano2021-10-292-2/+43
* | | | | | | | | | | | | | | | | | | Git 2.34-rc2v2.34.0-rc2Junio C Hamano2021-11-092-2/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'ab/parse-options-cleanup'Junio C Hamano2021-11-092-10/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | parse-options.[ch]: revert use of "enum" for parse_options()Ævar Arnfjörð Bjarmason2021-11-092-10/+9
* | | | | | | | | | | | | | | | | | | | Merge branch 'ad/ssh-signing-testfix'Junio C Hamano2021-11-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t/lib-git.sh: fix ACL-related permissions failureAdam Dinwoodie2021-11-051-0/+1
* | | | | | | | | | | | | | | | | | | | | A few fixes before -rc2Junio C Hamano2021-11-041-0/+7
* | | | | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2021-11-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'vd/pthread-setspecific-g11-fix' into maintJunio C Hamano2021-11-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ma/doc-git-version' into maintJunio C Hamano2021-11-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/rebase-r-fixes' into maintJunio C Hamano2021-11-042-1/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/log-warn-on-bogus-encoding' into maintJunio C Hamano2021-11-043-14/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'vd/pthread-setspecific-g11-fix'Junio C Hamano2021-11-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | async_die_is_recursing: work around GCC v11.x issue on FedoraVictoria Dye2021-11-031-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rd/http-backend-code-simplification'Junio C Hamano2021-11-041-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | http-backend: remove a duplicated code branchRobin Dupret2021-10-251-3/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ar/no-verify-doc'Junio C Hamano2021-11-043-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Document positive variant of commit and merge option "--no-verify"Alex Riesen2021-10-293-4/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ar/fix-git-pull-no-verify'Junio C Hamano2021-11-042-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | pull: honor --no-verify and do not call the commit-msg hookAlex Riesen2021-10-282-0/+30
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Git 2.34-rc1v2.34.0-rc1Junio C Hamano2021-11-031-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/rebase-r-fixes'Junio C Hamano2021-11-032-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | rebase -i: fix rewording with --committer-date-is-author-datePhillip Wood2021-11-032-1/+32
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ds/add-rm-with-sparse-index'Junio C Hamano2021-11-032-1/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | dir: fix directory-matching bugDerrick Stolee2021-11-032-1/+27
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jx/message-fixes'Junio C Hamano2021-11-033-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | i18n: fix typos found during l10n for git 2.34.0Jiang Xin2021-10-313-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/ssh-signing-fix'Junio C Hamano2021-11-031-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | gpg-interface: avoid buffer overrun in parse_ssh_output()René Scharfe2021-11-011-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | gpg-interface: handle missing " with " gracefully in parse_ssh_output()René Scharfe2021-11-011-4/+6
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | A few more topics before -rc1Junio C Hamano2021-11-011-0/+11
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/test-lib'Junio C Hamano2021-11-011-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t5310: drop lib-bundle.sh includeJeff King2021-10-291-1/+0
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-format-patch-clarify-auto-base'Junio C Hamano2021-11-011-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | format-patch (doc): clarify --base=autoJunio C Hamano2021-10-231-3/+3
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gc/use-repo-settings'Junio C Hamano2021-11-016-12/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | gc: perform incremental repack when implictly enabledGlen Choo2021-10-152-7/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | fsck: verify multi-pack-index when implictly enabledGlen Choo2021-10-152-2/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | fsck: verify commit graph when implicitly enabledGlen Choo2021-10-153-3/+29
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/ignore-replace-while-working-on-commit-graph' into gc/use-re...Junio C Hamano2021-10-153-11/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/ignore-replace-while-working-on-commit-graph'Junio C Hamano2021-11-013-11/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | commit-graph: don't consider "replace" objects with "verify"Ævar Arnfjörð Bjarmason2021-10-152-1/+2