summaryrefslogtreecommitdiffstats
path: root/contrib (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pb/subtree-split-and-merge-after-squashing-tag-fix'Taylor Blau2022-10-313-69/+184
|\
| * subtree: fix split after annotated tag was squashed mergedPhilippe Blain2022-10-213-9/+36
| * subtree: fix squash merging after annotated tag was squashed mergedPhilippe Blain2022-10-213-15/+86
| * subtree: process 'git-subtree-split' trailer in separate functionPhilippe Blain2022-10-211-4/+11
| * subtree: use named variables instead of "$@" in cmd_pullPhilippe Blain2022-10-211-2/+4
| * subtree: define a variable before its first use in 'find_latest_squash'Philippe Blain2022-10-211-1/+1
| * subtree: prefix die messages with 'fatal'Philippe Blain2022-10-212-36/+36
| * subtree: add 'die_incompatible_opt' function to reduce duplicationPhilippe Blain2022-10-211-12/+20
| * subtree: use 'git rev-parse --verify [--quiet]' for better error messagesPhilippe Blain2022-10-211-3/+3
* | Merge branch 'js/cmake-updates'Junio C Hamano2022-10-271-8/+8
|\ \ | |/ |/|
| * cmake: increase time-out for a long-running testJohannes Schindelin2022-10-191-0/+4
| * cmake: avoid editing t/test-lib.shJohannes Schindelin2022-10-191-6/+1
| * cmake: copy the merge tools for testingJohannes Schindelin2022-10-191-1/+2
| * cmake: make it easier to diagnose regressions in CTest runsJohannes Schindelin2022-10-191-1/+1
| * Merge branch 'cl/rerere-train-with-no-sign' into maintJunio C Hamano2022-08-111-1/+1
| |\
| * \ Merge branch 'ld/osx-keychain-usage-fix' into maintJunio C Hamano2022-08-061-1/+1
| |\ \
* | \ \ 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-191-0/+13
| * | | | | | scalar: enable built-in FSMonitor on `register`Matthew John Cheetham2022-08-192-0/+38
| * | | | | | scalar: move config setting logic into its own functionVictoria Dye2022-08-191-16/+28
| * | | | | | scalar-delete: do not 'die()' in 'delete_enlistment()'Victoria Dye2022-08-191-4/+7
| * | | | | | scalar-[un]register: clearly indicate source of errorVictoria Dye2022-08-191-8/+9
| * | | | | | scalar-unregister: handle error codes greater than 0Victoria Dye2022-08-191-2/+2
| * | | | | | scalar: constrain enlistment searchVictoria Dye2022-08-192-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-281-5/+2
| * | | | | tests: move copy/pasted PERL + Test::More checks to a lib-perl.shÆvar Arnfjörð Bjarmason2022-07-281-9/+2
| * | | | | t/Makefile: don't remove test-results in "clean-except-prove-cache"Ævar Arnfjörð Bjarmason2022-07-282-2/+2
* | | | | | Merge branch 'ca/unignore-local-installation-on-windows'Junio C Hamano2022-08-081-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 08:21:18 +0100