summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Git 2.33.1v2.33.1maintJunio C Hamano2021-10-12-1/+139
* Merge branch 'ah/connect-parse-feature-v0-fix' into maintJunio C Hamano2021-10-12-0/+17
|\
| * connect: also update offset for features without valuesAndrzej Hunt2021-09-27-0/+17
* | Merge branch 'ab/make-clean-depend-dirs' into maintJunio C Hamano2021-10-12-1/+0
|\ \
| * | Makefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yesÆvar Arnfjörð Bjarmason2021-09-22-1/+0
| |/
* | Merge branch 'jk/http-redact-fix' into maintJunio C Hamano2021-10-12-15/+15
|\ \
| * | http: match headers case-insensitively when redactingJeff King2021-09-22-15/+15
| |/
* | Merge branch 'da/difftool-dir-diff-symlink-fix' into maintJunio C Hamano2021-10-12-2/+67
|\ \
| * | difftool: fix symlink-file writing in dir-diff modeDavid Aguilar2021-09-23-2/+67
* | | Merge branch 'cb/cvsserver' into maintJunio C Hamano2021-10-12-17/+24
|\ \ \
| * | | Documentation: cleanup git-cvsserverCarlo Marcelo Arenas Belón2021-09-16-8/+9
| * | | git-cvsserver: protect against NULL in crypt(3)Carlo Marcelo Arenas Belón2021-09-16-3/+9
| * | | git-cvsserver: use crypt correctly to compare password hashesCarlo Marcelo Arenas Belón2021-09-16-8/+8
| | |/ | |/|
* | | Merge branch 'jk/clone-unborn-head-in-bare' into maintJunio C Hamano2021-10-12-16/+30
|\ \ \
| * | | clone: handle unborn branch in bare reposJeff King2021-09-20-16/+30
| |/ /
* | | Merge branch 'en/stash-df-fix' into maintJunio C Hamano2021-10-12-3/+75
|\ \ \
| * | | stash: restore untracked files AFTER restoring tracked filesElijah Newren2021-09-10-5/+5
| * | | stash: avoid feeding directories to update-indexElijah Newren2021-09-10-1/+15
| * | | t3903: document a pair of directory/file bugsElijah Newren2021-09-10-0/+58
| |/ /
* | | Merge branch 'jk/strvec-typefix' into maintJunio C Hamano2021-10-12-2/+2
|\ \ \
| * | | strvec: use size_t to store nr and allocJeff King2021-09-12-2/+2
| |/ /
* | | Merge branch 'en/am-abort-fix' into maintJunio C Hamano2021-10-12-1/+43
|\ \ \
| * | | am: fix incorrect exit status on am fail to abortElijah Newren2021-09-10-2/+3
| * | | t4151: add a few am --abort testsElijah Newren2021-09-10-0/+39
| * | | git-am.txt: clarify --abort behaviorElijah Newren2021-09-10-0/+2
| |/ /
* | | Merge branch 'ps/update-ref-batch-flush' into maintJunio C Hamano2021-10-12-4/+44
|\ \ \
| * | | t1400: avoid SIGPIPE race condition on fifoJeff King2021-09-15-3/+5
| * | | update-ref: fix streaming of status updatesPatrick Steinhardt2021-09-03-4/+42
| |/ /
* | | Merge branch 'rs/no-mode-to-open-when-appending' into maintJunio C Hamano2021-10-12-1/+1
|\ \ \
| * | | refs/files-backend: remove unused open mode parameterRené Scharfe2021-09-09-1/+1
| |/ /
* | | Merge branch 'tb/pack-finalize-ordering' into maintJunio C Hamano2021-10-12-67/+96
|\ \ \
| * | | pack-objects: rename .idx files into place after .bitmap filesÆvar Arnfjörð Bjarmason2021-09-09-1/+2
| * | | pack-write: split up finish_tmp_packfile() functionÆvar Arnfjörð Bjarmason2021-09-09-13/+39
| * | | builtin/index-pack.c: move `.idx` files into place lastTaylor Blau2021-09-09-2/+2
| * | | index-pack: refactor renaming in final()Ævar Arnfjörð Bjarmason2021-09-09-25/+23
| * | | builtin/repack.c: move `.idx` files into place lastTaylor Blau2021-09-09-1/+1
| * | | pack-write.c: rename `.idx` files after `*.rev`Taylor Blau2021-09-09-1/+1
| * | | pack-write: refactor renaming in finish_tmp_packfile()Ævar Arnfjörð Bjarmason2021-09-09-24/+23
| * | | bulk-checkin.c: store checksum directlyTaylor Blau2021-09-09-6/+6
| * | | pack.h: line-wrap the definition of finish_tmp_packfile()Ævar Arnfjörð Bjarmason2021-09-09-1/+6
| |/ /
* | | Merge branch 'rs/range-diff-avoid-segfault-with-I' into maintJunio C Hamano2021-10-12-0/+3
|\ \ \
| * | | range-diff: avoid segfault with -IRené Scharfe2021-09-07-0/+3
| |/ /
* | | Merge branch 'ab/reverse-midx-optim' into maintJunio C Hamano2021-10-12-0/+3
|\ \ \
| * | | pack-write: skip *.rev work when not writing *.revÆvar Arnfjörð Bjarmason2021-09-07-0/+3
| | |/ | |/|
* | | Merge branch 'jc/trivial-threeway-binary-merge' into maintJunio C Hamano2021-10-12-0/+66
|\ \ \
| * | | apply: resolve trivial merge without hitting ll-merge with "--3way"Junio C Hamano2021-09-05-0/+66
* | | | Merge branch 'ab/send-email-config-fix' into maintJunio C Hamano2021-10-12-1/+16
|\ \ \ \
| * | | | send-email: fix a "first config key wins" regression in v2.33.0Ævar Arnfjörð Bjarmason2021-09-07-1/+16
* | | | | Merge branch 'so/diff-index-regression-fix' into maintJunio C Hamano2021-10-12-14/+8
|\ \ \ \ \
| * | | | | diff-index: restore -c/--cc options handlingSergey Organov2021-09-07-14/+8
| | |_|_|/ | |/| | |