summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ed/fsmonitor-on-networked-macos'Junio C Hamano2022-10-171-0/+4
|\
| * fsmonitor: relocate socket file if .git directory is remoteEric DeCosta2022-10-051-0/+2
| * fsmonitor: refactor filesystem checks to common interfaceEric DeCosta2022-10-051-0/+2
* | osxkeychain: clarify that we ignore unknown linesMatthew John Cheetham2022-09-221-0/+5
* | netrc: ignore unknown lines (do not die)Matthew John Cheetham2022-09-221-1/+4
* | wincred: ignore unknown lines (do not die)Matthew John Cheetham2022-09-221-2/+5
* | t/Makefile: remove 'test-results' on 'make clean'SZEDER Gábor2022-09-211-0/+1
* | Merge branch 'vd/scalar-to-main'Junio C Hamano2022-09-197-1409/+6
|\ \
| * | scalar: include in standard Git build & installationVictoria Dye2022-09-027-1409/+6
| * | scalar: fix command documentation section headerVictoria Dye2022-09-021-2/+2
* | | test-lib: replace chainlint.sed with chainlint.plEric Sunshine2022-09-011-1/+1
|/ /
* | Merge branch 'jd/prompt-show-conflict'Junio C Hamano2022-08-291-1/+11
|\ \
| * | git-prompt: show presence of unresolved conflicts at command promptJustin Donnelly2022-08-191-1/+11
* | | Merge branch 'vd/scalar-enables-fsmonitor'Junio C Hamano2022-08-292-84/+210
|\ \ \
| * | | scalar unregister: stop FSMonitor daemonJohannes Schindelin2022-08-181-0/+13
| * | | scalar: enable built-in FSMonitor on `register`Matthew John Cheetham2022-08-182-0/+38
| * | | scalar: move config setting logic into its own functionVictoria Dye2022-08-181-16/+28
| * | | scalar-delete: do not 'die()' in 'delete_enlistment()'Victoria Dye2022-08-181-4/+7
| * | | scalar-[un]register: clearly indicate source of errorVictoria Dye2022-08-181-8/+9
| * | | scalar-unregister: handle error codes greater than 0Victoria Dye2022-08-181-2/+2
| * | | scalar: constrain enlistment searchVictoria Dye2022-08-182-54/+113
| |/ /
* | | Merge branch 'vd/scalar-generalize-diagnose'Junio C Hamano2022-08-252-269/+10
|\ \ \ | |/ / |/| |
| * | scalar-diagnose: use 'git diagnose --mode=all'Victoria Dye2022-08-121-22/+6
| * | diagnose.c: add option to configure archive contentsVictoria Dye2022-08-121-1/+1
| * | scalar-diagnose: move functionality to common locationVictoria Dye2022-08-121-200/+2
| * | scalar-diagnose: move 'get_disk_info()' to 'compat/'Victoria Dye2022-08-121-52/+1
| * | scalar-diagnose: add directory to archiver more gentlyVictoria Dye2022-08-121-2/+8
| * | scalar-diagnose: avoid 32-bit overflow of size_tVictoria Dye2022-08-121-1/+1
| * | scalar-diagnose: use "$GIT_UNZIP" in testVictoria Dye2022-08-121-4/+4
* | | Merge branch 'ab/leak-check'Junio C Hamano2022-08-123-16/+6
|\ \ \ | |_|/ |/| |
| * | test-lib: simplify by removing test_externalÆvar Arnfjörð Bjarmason2022-07-271-5/+2
| * | tests: move copy/pasted PERL + Test::More checks to a lib-perl.shÆvar Arnfjörð Bjarmason2022-07-271-9/+2
| * | t/Makefile: don't remove test-results in "clean-except-prove-cache"Ævar Arnfjörð Bjarmason2022-07-272-2/+2
* | | Merge branch 'ca/unignore-local-installation-on-windows'Junio C Hamano2022-08-081-1/+1
|\ \ \ | |_|/ |/| |
| * | cmake: support local installations of gitCarlo Marcelo Arenas Belón2022-07-271-1/+1
* | | Merge branch 'cl/rerere-train-with-no-sign'Junio C Hamano2022-08-011-1/+1
|\ \ \
| * | | contrib/rerere-train: avoid useless gpg sign in trainingCeleste Liu2022-07-191-1/+1
| |/ /
* | | Merge branch 'ld/osx-keychain-usage-fix'Junio C Hamano2022-07-271-1/+1
|\ \ \
| * | | osx-keychain: fix compiler warningLessley Dennington2022-07-191-1/+1
| |/ /
* | | Merge branch 'vd/scalar-doc'Junio C Hamano2022-07-272-87/+4
|\ \ \ | |_|/ |/| |
| * | scalar: convert README.md into a technical design docVictoria Dye2022-07-181-82/+0
| * | scalar: reword command documentation to clarify purposeVictoria Dye2022-07-181-5/+4
* | | Merge branch 'rs/cocci-array-copy'Junio C Hamano2022-07-191-42/+40
|\ \ \
| * | | cocci: avoid normalization rules for memcpyRené Scharfe2022-07-101-42/+40
* | | | Merge branch 'ab/cocci-unused'Junio C Hamano2022-07-186-2/+191
|\ \ \ \ | |_|/ / |/| | |
| * | | cocci: generalize "unused" rule to cover more than "strbuf"Ævar Arnfjörð Bjarmason2022-07-063-4/+57
| * | | cocci: add and apply a rule to find "unused" strbufsÆvar Arnfjörð Bjarmason2022-07-064-2/+118
| * | | cocci: add a "coccicheck-test" target and test *.cocci rulesÆvar Arnfjörð Bjarmason2022-07-062-0/+20
| | |/ | |/|
* | | Merge branch 'ab/submodule-cleanup'Junio C Hamano2022-07-141-3/+12
|\ \ \
| * | | git-sh-setup.sh: remove "say" function, change last usersÆvar Arnfjörð Bjarmason2022-06-281-3/+12