summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.35-rc0v2.35.0-rc0Junio C Hamano2022-01-102-1/+60
* Merge branch 'en/stash-df-fix'Junio C Hamano2022-01-102-4/+29
|\
| * stash: do not return before restoring untracked filesElijah Newren2022-01-042-4/+29
* | Merge branch 'ms/t-readme-typofix'Junio C Hamano2022-01-101-1/+1
|\ \
| * | t/README: fix typoMarc Strapetz2022-01-041-1/+1
* | | Merge branch 'ja/i18n-similar-messages'Junio C Hamano2022-01-1051-178/+189
|\ \ \
| * | | i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila2022-01-0523-41/+47
| * | | i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"Jean-Noël Avila2022-01-051-4/+4
| * | | i18n: factorize "--foo outside a repository"Jean-Noël Avila2022-01-051-3/+3
| * | | i18n: refactor "unrecognized %(foo) argument" stringsJean-Noël Avila2022-01-051-7/+7
| * | | i18n: factorize "no directory given for --foo"Jean-Noël Avila2022-01-051-3/+3
| * | | i18n: factorize "--foo requires --bar" and the likeJean-Noël Avila2022-01-0521-24/+24
| * | | i18n: tag.c factorize i18n stringsJean-Noël Avila2022-01-051-9/+14
| * | | i18n: standardize "cannot open" and "cannot read"Jean-Noël Avila2022-01-052-4/+4
| * | | i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-0531-64/+64
| * | | i18n: refactor "%s, %s and %s are mutually exclusive"Jean-Noël Avila2022-01-055-7/+7
| * | | i18n: refactor "foo and bar are mutually exclusive"Jean-Noël Avila2022-01-0510-13/+13
* | | | Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix'Junio C Hamano2022-01-102-3/+42
|\ \ \ \
| * | | | merge-ort: fix bug with renormalization and rename/delete conflictsElijah Newren2021-12-302-3/+42
* | | | | Merge branch 'jc/doc-submitting-patches-choice-of-base'Junio C Hamano2022-01-101-14/+39
|\ \ \ \ \
| * | | | | SubmittingPatchs: clarify choice of base and testingJunio C Hamano2021-12-301-14/+39
* | | | | | Merge branch 'jl/subtree-check-parents-argument-passing-fix'Junio C Hamano2022-01-101-4/+3
|\ \ \ \ \ \
| * | | | | | subtree: fix argument handling in check_parentsJames Limbouris2022-01-041-4/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'lh/use-gnu-color-in-grep'Junio C Hamano2022-01-101-3/+3
|\ \ \ \ \ \
| * | | | | | grep: align default colors with GNU grep onesLénaïc Huard2022-01-051-3/+3
* | | | | | | Merge branch 'js/branch-track-inherit'Junio C Hamano2022-01-1016-67/+312
|\ \ \ \ \ \ \
| * | | | | | | config: require lowercase for branch.*.autosetupmergeJosh Steadmon2021-12-201-1/+1
| * | | | | | | branch: add flags and config to inherit trackingJosh Steadmon2021-12-2016-23/+205
| * | | | | | | branch: accept multiple upstream branches for trackingJosh Steadmon2021-12-202-43/+106
* | | | | | | | Merge branch 'ab/usage-die-message'Junio C Hamano2022-01-109-34/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | config API: use get_error_routine(), not vreportf()Ævar Arnfjörð Bjarmason2021-12-073-3/+3
| * | | | | | | | usage.c + gc: add and use a die_message_errno()Ævar Arnfjörð Bjarmason2021-12-073-6/+20
| * | | | | | | | gc: return from cmd_gc(), don't call exit()Ævar Arnfjörð Bjarmason2021-12-071-1/+2
| * | | | | | | | usage.c API users: use die_message() for error() + exit 128Ævar Arnfjörð Bjarmason2021-12-071-4/+5
| * | | | | | | | usage.c API users: use die_message() for "fatal :" + exit 128Ævar Arnfjörð Bjarmason2021-12-074-18/+15
| * | | | | | | | usage.c: add a die_message() routineÆvar Arnfjörð Bjarmason2021-12-072-3/+27
* | | | | | | | | Merge branch 'jz/apply-3-corner-cases'Junio C Hamano2022-01-102-1/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-apply: skip threeway in add / rename casesJerry Zhang2021-12-202-1/+21
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'hn/reftable-fixes'Junio C Hamano2022-01-108-11/+101
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reftable: support preset file mode for writingHan-Wen Nienhuys2021-12-233-10/+56
| * | | | | | | | | reftable: signal overflowHan-Wen Nienhuys2021-12-234-0/+44
| * | | | | | | | | reftable: fix typo in headerHan-Wen Nienhuys2021-12-231-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/reflog-prep'Junio C Hamano2022-01-103-120/+150
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reflog + refs-backend: move "verbose" out of the backendÆvar Arnfjörð Bjarmason2021-12-223-35/+68
| * | | | | | | | | refs files-backend: assume cb->newlog if !EXPIRE_REFLOGS_DRY_RUNÆvar Arnfjörð Bjarmason2021-12-221-2/+2
| * | | | | | | | | reflog: reduce scope of "struct rev_info"Ævar Arnfjörð Bjarmason2021-12-221-6/+7
| * | | | | | | | | reflog expire: don't use lookup_commit_reference_gently()Ævar Arnfjörð Bjarmason2021-12-221-2/+1
| * | | | | | | | | reflog expire: refactor & use "tip_commit" only for UE_NORMALÆvar Arnfjörð Bjarmason2021-12-221-7/+7
| * | | | | | | | | reflog expire: use "switch" over enum valuesÆvar Arnfjörð Bjarmason2021-12-221-24/+33
| * | | | | | | | | reflog: change one->many worktree->refnames to use a string_listÆvar Arnfjörð Bjarmason2021-12-221-29/+18