Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tk/fast-export-anonymized-tag-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -4/+6 |
|\ | |||||
| * | fast-export: fix anonymized tag using original length | Tal Kelrich | 2021-08-31 | 1 | -4/+6 |
* | | Merge branch 'mh/send-email-reset-in-reply-to' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+45 |
|\ \ | |||||
| * | | send-email: avoid incorrect header propagation | Marvin Häuser | 2021-08-30 | 1 | -0/+45 |
| |/ | |||||
* | | Merge branch 'sg/set-ceiling-during-tests' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+2 |
|\ \ | |||||
| * | | test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repository | SZEDER Gábor | 2021-08-30 | 1 | -1/+2 |
* | | | Merge branch 'ka/want-ref-in-namespace' into maint | Junio C Hamano | 2021-10-12 | 1 | -36/+172 |
|\ \ \ | |||||
| * | | | upload-pack.c: treat want-ref relative to namespace | Kim Altintop | 2021-09-01 | 1 | -0/+135 |
| * | | | t5730: introduce fetch command helper | Kim Altintop | 2021-09-01 | 1 | -36/+37 |
* | | | | Merge branch 'sg/column-nl' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+18 |
|\ \ \ \ | |||||
| * | | | | column: fix parsing of the '--nl' option | SZEDER Gábor | 2021-08-26 | 1 | -0/+18 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'rs/branch-allow-deleting-dangling' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+13 |
|\ \ \ \ | |||||
| * | | | | branch: allow deleting dangling branches with --force | René Scharfe | 2021-08-28 | 1 | -0/+13 |
| |/ / / | |||||
* | | | | Merge branch 'mt/quiet-with-delayed-checkout' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+71 |
|\ \ \ \ | |||||
| * | | | | checkout: make delayed checkout respect --quiet and --no-progress | Matheus Tavares | 2021-08-27 | 1 | -0/+71 |
| |/ / / | |||||
* | | | | Merge branch 'dd/diff-files-unmerged-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+53 |
|\ \ \ \ | |||||
| * | | | | diff-lib: ignore paths that are outside $cwd if --relative asked | Đoàn Trần Công Danh | 2021-08-25 | 1 | -0/+53 |
* | | | | | Merge branch 'pw/rebase-r-fixes' into maint | Junio C Hamano | 2021-10-12 | 3 | -9/+98 |
|\ \ \ \ \ | |||||
| * | | | | | rebase -r: fix merge -c with a merge strategy | Phillip Wood | 2021-08-23 | 1 | -0/+18 |
| * | | | | | rebase -r: don't write .git/MERGE_MSG when fast-forwarding | Phillip Wood | 2021-08-23 | 1 | -2/+8 |
| * | | | | | rebase -i: add another reword test | Phillip Wood | 2021-08-23 | 1 | -0/+13 |
| * | | | | | rebase -r: make 'merge -c' behave like reword | Phillip Wood | 2021-08-20 | 2 | -9/+61 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'pw/rebase-skip-final-fix' into maint | Junio C Hamano | 2021-10-12 | 2 | -6/+25 |
|\ \ \ \ \ | |||||
| * | | | | | rebase --continue: remove .git/MERGE_MSG | Phillip Wood | 2021-08-13 | 2 | -0/+18 |
| * | | | | | rebase --apply: restore some tests | Phillip Wood | 2021-08-13 | 2 | -5/+5 |
| * | | | | | t3403: fix commit authorship | Phillip Wood | 2021-08-13 | 1 | -1/+2 |
* | | | | | | Merge branch 'jk/commit-edit-fixup-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: restore --edit when combined with --fixup | Joel Klinghed | 2021-08-15 | 1 | -1/+8 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/apply-binary-hunk-parsing-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | apply: keep buffer/size pair in sync when parsing binary hunks | Jeff King | 2021-08-10 | 1 | -0/+23 |
* | | | | | | | Merge branch 'en/pull-conflicting-options' into maint | Junio C Hamano | 2021-10-12 | 11 | -62/+266 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pull: fix handling of multiple heads | Elijah Newren | 2021-07-22 | 1 | -1/+1 |
| * | | | | | | | pull: abort by default when fast-forwarding is not possible | Elijah Newren | 2021-07-22 | 11 | -66/+66 |
| * | | | | | | | pull: make --rebase and --no-rebase override pull.ff=only | Elijah Newren | 2021-07-22 | 1 | -2/+2 |
| * | | | | | | | pull: abort if --ff-only is given and fast-forwarding is impossible | Alex Henrie | 2021-07-21 | 1 | -5/+5 |
| * | | | | | | | t7601: add tests of interactions with multiple merge heads and config | Elijah Newren | 2021-07-21 | 1 | -0/+22 |
| * | | | | | | | t7601: test interaction of merge/rebase/fast-forward flags and options | Elijah Newren | 2021-07-21 | 1 | -0/+182 |
* | | | | | | | | Merge branch 'jt/push-negotiation-fixes' into maint | Junio C Hamano | 2021-10-12 | 3 | -1/+88 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch: die on invalid --negotiation-tip hash | Jonathan Tan | 2021-07-15 | 1 | -0/+13 |
| * | | | | | | | | send-pack: fix push nego. when remote has refs | Jonathan Tan | 2021-07-15 | 2 | -1/+4 |
| * | | | | | | | | send-pack: fix push.negotiate with remote helper | Jonathan Tan | 2021-07-15 | 1 | -0/+71 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ab/pack-stdin-packs-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+104 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | pack-objects: fix segfault in --stdin-packs option | Ævar Arnfjörð Bjarmason | 2021-07-09 | 1 | -0/+19 |
| * | | | | | | | | pack-objects tests: cover blindspots in stdin handling | Ævar Arnfjörð Bjarmason | 2021-06-29 | 1 | -0/+85 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'cb/plug-leaks-in-alloca-emu-users' into maint | Junio C Hamano | 2021-10-12 | 1 | -11/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t0000: avoid masking git exit value through pipes | Carlo Marcelo Arenas Belón | 2021-09-16 | 1 | -11/+12 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/t5562-racefix' into maint | Junio C Hamano | 2021-10-12 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5562: use alarm() to interrupt timed child-wait | Jeff King | 2021-09-10 | 1 | -8/+8 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'dd/t6300-wo-gpg-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -11/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t6300: check for cat-file exit status code | Đoàn Trần Công Danh | 2021-08-25 | 1 | -1/+3 |