summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* difftool: create a tmpdir path without repeated slashesDavid Aguilar2021-10-011-0/+7
* Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftoolJunio C Hamano2021-09-231-2/+65
|\
| * difftool: fix symlink-file writing in dir-diff modeDavid Aguilar2021-09-231-2/+65
* | Merge branch 'ab/retire-option-argument' into da/difftoolJunio C Hamano2021-09-202-6/+0
|\ \
| * | parse-options API: remove OPTION_ARGUMENT featureÆvar Arnfjörð Bjarmason2021-09-132-6/+0
* | | Merge branch 'pb/test-use-user-env'Junio C Hamano2021-09-153-21/+103
|\ \ \
| * | | test-lib-functions: keep user's debugger config files and TERM in 'debug'Philippe Blain2021-09-072-16/+50
| * | | test-lib-functions: optionally keep HOME, TERM and SHELL in 'test_pause'Philippe Blain2021-09-073-5/+53
| * | | test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause'Philippe Blain2021-09-071-1/+1
| |/ /
* | | Merge branch 'jc/trivial-threeway-binary-merge'Junio C Hamano2021-09-151-0/+45
|\ \ \
| * | | apply: resolve trivial merge without hitting ll-merge with "--3way"Junio C Hamano2021-09-061-0/+45
* | | | Merge branch 'ab/send-email-config-fix'Junio C Hamano2021-09-151-0/+15
|\ \ \ \
| * | | | send-email: fix a "first config key wins" regression in v2.33.0Ævar Arnfjörð Bjarmason2021-09-071-0/+15
* | | | | Merge branch 'jk/log-warn-on-bogus-encoding'Junio C Hamano2021-09-101-0/+7
|\ \ \ \ \
| * | | | | logmsg_reencode(): warn when iconv() failsJeff King2021-08-271-0/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'mk/clone-recurse-submodules'Junio C Hamano2021-09-101-0/+12
|\ \ \ \ \
| * | | | | clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabledMahi Kolla2021-08-301-0/+12
| |/ / / /
* | | | | Merge branch 'uk/userdiff-php-enum'Junio C Hamano2021-09-101-0/+4
|\ \ \ \ \
| * | | | | userdiff: support enum keyword in PHP hunk headerUSAMI Kenta2021-08-311-0/+4
| |/ / / /
* | | | | Merge branch 'tk/fast-export-anonymized-tag-fix'Junio C Hamano2021-09-101-4/+6
|\ \ \ \ \
| * | | | | fast-export: fix anonymized tag using original lengthTal Kelrich2021-08-311-4/+6
* | | | | | Merge branch 'ab/commit-graph-usage'Junio C Hamano2021-09-101-0/+19
|\ \ \ \ \ \
| * | | | | | commit-graph: show "unexpected subcommand" errorÆvar Arnfjörð Bjarmason2021-08-311-1/+15
| * | | | | | commit-graph: show usage on "commit-graph [write|verify] garbage"Ævar Arnfjörð Bjarmason2021-08-311-0/+5
* | | | | | | Merge branch 'mh/send-email-reset-in-reply-to'Junio C Hamano2021-09-101-0/+45
|\ \ \ \ \ \ \
| * | | | | | | send-email: avoid incorrect header propagationMarvin Häuser2021-08-301-0/+45
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sg/set-ceiling-during-tests'Junio C Hamano2021-09-101-1/+2
|\ \ \ \ \ \ \
| * | | | | | | test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repositorySZEDER Gábor2021-08-301-1/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ka/want-ref-in-namespace'Junio C Hamano2021-09-101-36/+172
|\ \ \ \ \ \ \
| * | | | | | | upload-pack.c: treat want-ref relative to namespaceKim Altintop2021-09-011-0/+135
| * | | | | | | t5730: introduce fetch command helperKim Altintop2021-09-011-36/+37
* | | | | | | | Merge branch 'zh/cherry-pick-advice'Junio C Hamano2021-09-102-7/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | cherry-pick: use better advice messageZheNing Hu2021-08-232-7/+26
| |/ / / / / / /
* | | | | | | | Merge branch 'sg/column-nl'Junio C Hamano2021-09-081-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | column: fix parsing of the '--nl' optionSZEDER Gábor2021-08-261-0/+18
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rs/branch-allow-deleting-dangling'Junio C Hamano2021-09-081-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: allow deleting dangling branches with --forceRené Scharfe2021-08-281-0/+13
| |/ / / / / / /
* | | | | | | | Merge branch 'mt/quiet-with-delayed-checkout'Junio C Hamano2021-09-081-0/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: make delayed checkout respect --quiet and --no-progressMatheus Tavares2021-08-271-0/+71
| |/ / / / / / /
* | | | | | | | Merge branch 'dd/diff-files-unmerged-fix'Junio C Hamano2021-09-081-0/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-lib: ignore paths that are outside $cwd if --relative askedĐoàn Trần Công Danh2021-08-251-0/+53
* | | | | | | | | Merge branch 'dd/t6300-wo-gpg-fix'Junio C Hamano2021-09-081-11/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t6300: check for cat-file exit status codeĐoàn Trần Công Danh2021-08-251-1/+3
| * | | | | | | | | t6300: don't run cat-file on non-existent objectĐoàn Trần Công Danh2021-08-251-11/+16
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/t5323-no-pack-test-fix'Junio C Hamano2021-09-081-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5323: drop mentions of "master"Jeff King2021-08-251-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'js/maintenance-launchctl-fix'Junio C Hamano2021-09-081-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | maintenance: skip bootout/bootstrap when plist is registeredDerrick Stolee2021-08-241-0/+17
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/ls-remote-packet-trace'Junio C Hamano2021-09-081-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ls-remote: set packet_trace_identity(<name>)Ævar Arnfjörð Bjarmason2021-08-241-3/+3
| | |/ / / / / / / | |/| | | | | | |