summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
...
* | | | | Merge branch 'jk/log-warn-on-bogus-encoding' into maintJunio C Hamano2021-10-12-4/+17
|\ \ \ \ \
| * | | | | docs: use "character encoding" to refer to commit-object encodingJeff King2021-08-27-2/+2
| * | | | | logmsg_reencode(): warn when iconv() failsJeff King2021-08-27-2/+15
| |/ / / /
* | | | | Merge branch 'tk/fast-export-anonymized-tag-fix' into maintJunio C Hamano2021-10-12-4/+7
|\ \ \ \ \
| * | | | | fast-export: fix anonymized tag using original lengthTal Kelrich2021-08-31-4/+7
* | | | | | Merge branch 'mh/send-email-reset-in-reply-to' into maintJunio C Hamano2021-10-12-9/+62
|\ \ \ \ \ \
| * | | | | | send-email: avoid incorrect header propagationMarvin Häuser2021-08-30-9/+62
| |/ / / / /
* | | | | | Merge branch 'sg/set-ceiling-during-tests' into maintJunio C Hamano2021-10-12-1/+2
|\ \ \ \ \ \
| * | | | | | test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repositorySZEDER Gábor2021-08-30-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jh/sparse-index-resize-fix' into maintJunio C Hamano2021-10-12-0/+1
|\ \ \ \ \ \
| * | | | | | sparse-index: copy dir_hash in ensure_full_index()Jeff Hostetler2021-08-30-0/+1
| |/ / / / /
* | | | | | Merge branch 'ka/want-ref-in-namespace' into maintJunio C Hamano2021-10-12-48/+192
|\ \ \ \ \ \
| * | | | | | docs: clarify the interaction of transfer.hideRefs and namespacesKim Altintop2021-09-01-5/+9
| * | | | | | upload-pack.c: treat want-ref relative to namespaceKim Altintop2021-09-01-7/+146
| * | | | | | t5730: introduce fetch command helperKim Altintop2021-09-01-36/+37
* | | | | | | Merge branch 'sg/column-nl' into maintJunio C Hamano2021-10-12-2/+20
|\ \ \ \ \ \ \
| * | | | | | | column: fix parsing of the '--nl' optionSZEDER Gábor2021-08-26-2/+20
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'cb/makefile-apple-clang' into maintJunio C Hamano2021-10-12-6/+3
|\ \ \ \ \ \ \
| * | | | | | | build: catch clang that identifies itself as "$VENDOR clang"Junio C Hamano2021-08-06-5/+2
| * | | | | | | build: clang version may not be followed by extra wordsJeff King2021-08-06-2/+2
| * | | | | | | build: update detect-compiler for newer Xcode versionCarlo Marcelo Arenas Belón2021-08-06-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rs/branch-allow-deleting-dangling' into maintJunio C Hamano2021-10-12-2/+16
|\ \ \ \ \ \ \
| * | | | | | | branch: allow deleting dangling branches with --forceRené Scharfe2021-08-27-2/+16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mt/quiet-with-delayed-checkout' into maintJunio C Hamano2021-10-12-5/+80
|\ \ \ \ \ \ \
| * | | | | | | checkout: make delayed checkout respect --quiet and --no-progressMatheus Tavares2021-08-26-5/+80
| |/ / / / / /
* | | | | | | Merge branch 'dd/diff-files-unmerged-fix' into maintJunio C Hamano2021-10-12-0/+57
|\ \ \ \ \ \ \
| * | | | | | | diff-lib: ignore paths that are outside $cwd if --relative askedĐoàn Trần Công Danh2021-08-25-0/+57
* | | | | | | | Merge branch 'rs/git-mmap-uses-malloc' into maintJunio C Hamano2021-10-12-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | compat: let git_mmap use malloc(3) directlyRené Scharfe2021-08-24-1/+6
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pw/rebase-r-fixes' into maintJunio C Hamano2021-10-12-58/+155
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase -r: fix merge -c with a merge strategyPhillip Wood2021-08-23-1/+22
| * | | | | | | | rebase -r: don't write .git/MERGE_MSG when fast-forwardingPhillip Wood2021-08-23-42/+49
| * | | | | | | | rebase -i: add another reword testPhillip Wood2021-08-23-0/+13
| * | | | | | | | rebase -r: make 'merge -c' behave like rewordPhillip Wood2021-08-20-19/+75
* | | | | | | | | Merge branch 'pw/rebase-skip-final-fix' into maintJunio C Hamano2021-10-12-6/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase --continue: remove .git/MERGE_MSGPhillip Wood2021-08-13-0/+21
| * | | | | | | | | rebase --apply: restore some testsPhillip Wood2021-08-13-5/+5
| * | | | | | | | | t3403: fix commit authorshipPhillip Wood2021-08-13-1/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'cb/ci-use-upload-artifacts-v1' into maintJunio C Hamano2021-10-12-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ci: use upload-artifacts v1 for dockerized jobsCarlo Marcelo Arenas Belón2021-08-15-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/commit-edit-fixup-fix' into maintJunio C Hamano2021-10-12-3/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: restore --edit when combined with --fixupJoel Klinghed2021-08-15-3/+11
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/range-diff-fixes' into maintJunio C Hamano2021-10-12-16/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | range-diff: use ssize_t for parsed "len" in read_patches()Jeff King2021-08-10-1/+1
| * | | | | | | | | range-diff: handle unterminated lines in read_patches()Jeff King2021-08-10-14/+11
| * | | | | | | | | range-diff: drop useless "offset" variable from read_patches()Jeff King2021-08-10-2/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/apply-binary-hunk-parsing-fix' into maintJunio C Hamano2021-10-12-0/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply: keep buffer/size pair in sync when parsing binary hunksJeff King2021-08-10-0/+24
* | | | | | | | | | Merge branch 'en/pull-conflicting-options' into maintJunio C Hamano2021-10-12-83/+371
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pull: fix handling of multiple headsElijah Newren2021-07-22-5/+15
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 15:05:23 +0000