summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tk/fast-export-anonymized-tag-fix' into maintJunio C Hamano2021-10-121-4/+6
|\
| * fast-export: fix anonymized tag using original lengthTal Kelrich2021-08-311-4/+6
* | Merge branch 'mh/send-email-reset-in-reply-to' into maintJunio C Hamano2021-10-121-0/+45
|\ \
| * | send-email: avoid incorrect header propagationMarvin Häuser2021-08-301-0/+45
| |/
* | Merge branch 'sg/set-ceiling-during-tests' into maintJunio C Hamano2021-10-121-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' into maintJunio C Hamano2021-10-121-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 'sg/column-nl' into maintJunio C Hamano2021-10-121-0/+18
|\ \ \ \
| * | | | column: fix parsing of the '--nl' optionSZEDER Gábor2021-08-261-0/+18
| | |/ / | |/| |
* | | | Merge branch 'rs/branch-allow-deleting-dangling' into maintJunio C Hamano2021-10-121-0/+13
|\ \ \ \
| * | | | branch: allow deleting dangling branches with --forceRené Scharfe2021-08-281-0/+13
| |/ / /
* | | | Merge branch 'mt/quiet-with-delayed-checkout' into maintJunio C Hamano2021-10-121-0/+71
|\ \ \ \
| * | | | checkout: make delayed checkout respect --quiet and --no-progressMatheus Tavares2021-08-271-0/+71
| |/ / /
* | | | Merge branch 'dd/diff-files-unmerged-fix' into maintJunio C Hamano2021-10-121-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 'pw/rebase-r-fixes' into maintJunio C Hamano2021-10-123-9/+98
|\ \ \ \ \
| * | | | | rebase -r: fix merge -c with a merge strategyPhillip Wood2021-08-231-0/+18
| * | | | | rebase -r: don't write .git/MERGE_MSG when fast-forwardingPhillip Wood2021-08-231-2/+8
| * | | | | rebase -i: add another reword testPhillip Wood2021-08-231-0/+13
| * | | | | rebase -r: make 'merge -c' behave like rewordPhillip Wood2021-08-202-9/+61
| | |/ / / | |/| | |
* | | | | Merge branch 'pw/rebase-skip-final-fix' into maintJunio C Hamano2021-10-122-6/+25
|\ \ \ \ \
| * | | | | rebase --continue: remove .git/MERGE_MSGPhillip Wood2021-08-132-0/+18
| * | | | | rebase --apply: restore some testsPhillip Wood2021-08-132-5/+5
| * | | | | t3403: fix commit authorshipPhillip Wood2021-08-131-1/+2
* | | | | | Merge branch 'jk/commit-edit-fixup-fix' into maintJunio C Hamano2021-10-121-1/+8
|\ \ \ \ \ \
| * | | | | | commit: restore --edit when combined with --fixupJoel Klinghed2021-08-151-1/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/apply-binary-hunk-parsing-fix' into maintJunio C Hamano2021-10-121-0/+23
|\ \ \ \ \ \
| * | | | | | apply: keep buffer/size pair in sync when parsing binary hunksJeff King2021-08-101-0/+23
* | | | | | | Merge branch 'en/pull-conflicting-options' into maintJunio C Hamano2021-10-1211-62/+266
|\ \ \ \ \ \ \
| * | | | | | | pull: fix handling of multiple headsElijah Newren2021-07-221-1/+1
| * | | | | | | pull: abort by default when fast-forwarding is not possibleElijah Newren2021-07-2211-66/+66
| * | | | | | | pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren2021-07-221-2/+2
| * | | | | | | pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie2021-07-211-5/+5
| * | | | | | | t7601: add tests of interactions with multiple merge heads and configElijah Newren2021-07-211-0/+22
| * | | | | | | t7601: test interaction of merge/rebase/fast-forward flags and optionsElijah Newren2021-07-211-0/+182
* | | | | | | | Merge branch 'jt/push-negotiation-fixes' into maintJunio C Hamano2021-10-123-1/+88
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch: die on invalid --negotiation-tip hashJonathan Tan2021-07-151-0/+13
| * | | | | | | | send-pack: fix push nego. when remote has refsJonathan Tan2021-07-152-1/+4
| * | | | | | | | send-pack: fix push.negotiate with remote helperJonathan Tan2021-07-151-0/+71
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'ab/pack-stdin-packs-fix' into maintJunio C Hamano2021-10-121-0/+104
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-objects: fix segfault in --stdin-packs optionÆvar Arnfjörð Bjarmason2021-07-091-0/+19
| * | | | | | | | pack-objects tests: cover blindspots in stdin handlingÆvar Arnfjörð Bjarmason2021-06-291-0/+85
| |/ / / / / / /
* | | | | | | | Merge branch 'cb/plug-leaks-in-alloca-emu-users' into maintJunio C Hamano2021-10-121-11/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | t0000: avoid masking git exit value through pipesCarlo Marcelo Arenas Belón2021-09-161-11/+12
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/t5562-racefix' into maintJunio C Hamano2021-10-121-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | t5562: use alarm() to interrupt timed child-waitJeff King2021-09-101-8/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'dd/t6300-wo-gpg-fix' into maintJunio C Hamano2021-10-121-11/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | t6300: check for cat-file exit status codeĐoàn Trần Công Danh2021-08-251-1/+3