Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.35-rc0v2.35.0-rc0 | Junio C Hamano | 2022-01-10 | 2 | -1/+60 |
* | Merge branch 'en/stash-df-fix' | Junio C Hamano | 2022-01-10 | 2 | -4/+29 |
|\ | |||||
| * | stash: do not return before restoring untracked files | Elijah Newren | 2022-01-04 | 2 | -4/+29 |
* | | Merge branch 'ms/t-readme-typofix' | Junio C Hamano | 2022-01-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | t/README: fix typo | Marc Strapetz | 2022-01-04 | 1 | -1/+1 |
* | | | Merge branch 'ja/i18n-similar-messages' | Junio C Hamano | 2022-01-10 | 51 | -178/+189 |
|\ \ \ | |||||
| * | | | i18n: turn even more messages into "cannot be used together" ones | Jean-Noël Avila | 2022-01-05 | 23 | -41/+47 |
| * | | | i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom" | Jean-Noël Avila | 2022-01-05 | 1 | -4/+4 |
| * | | | i18n: factorize "--foo outside a repository" | Jean-Noël Avila | 2022-01-05 | 1 | -3/+3 |
| * | | | i18n: refactor "unrecognized %(foo) argument" strings | Jean-Noël Avila | 2022-01-05 | 1 | -7/+7 |
| * | | | i18n: factorize "no directory given for --foo" | Jean-Noël Avila | 2022-01-05 | 1 | -3/+3 |
| * | | | i18n: factorize "--foo requires --bar" and the like | Jean-Noël Avila | 2022-01-05 | 21 | -24/+24 |
| * | | | i18n: tag.c factorize i18n strings | Jean-Noël Avila | 2022-01-05 | 1 | -9/+14 |
| * | | | i18n: standardize "cannot open" and "cannot read" | Jean-Noël Avila | 2022-01-05 | 2 | -4/+4 |
| * | | | i18n: turn "options are incompatible" into "cannot be used together" | Jean-Noël Avila | 2022-01-05 | 31 | -64/+64 |
| * | | | i18n: refactor "%s, %s and %s are mutually exclusive" | Jean-Noël Avila | 2022-01-05 | 5 | -7/+7 |
| * | | | i18n: refactor "foo and bar are mutually exclusive" | Jean-Noël Avila | 2022-01-05 | 10 | -13/+13 |
* | | | | Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix' | Junio C Hamano | 2022-01-10 | 2 | -3/+42 |
|\ \ \ \ | |||||
| * | | | | merge-ort: fix bug with renormalization and rename/delete conflicts | Elijah Newren | 2021-12-30 | 2 | -3/+42 |
* | | | | | Merge branch 'jc/doc-submitting-patches-choice-of-base' | Junio C Hamano | 2022-01-10 | 1 | -14/+39 |
|\ \ \ \ \ | |||||
| * | | | | | SubmittingPatchs: clarify choice of base and testing | Junio C Hamano | 2021-12-30 | 1 | -14/+39 |
* | | | | | | Merge branch 'jl/subtree-check-parents-argument-passing-fix' | Junio C Hamano | 2022-01-10 | 1 | -4/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | subtree: fix argument handling in check_parents | James Limbouris | 2022-01-04 | 1 | -4/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'lh/use-gnu-color-in-grep' | Junio C Hamano | 2022-01-10 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | grep: align default colors with GNU grep ones | Lénaïc Huard | 2022-01-05 | 1 | -3/+3 |
* | | | | | | | Merge branch 'js/branch-track-inherit' | Junio C Hamano | 2022-01-10 | 16 | -67/+312 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | config: require lowercase for branch.*.autosetupmerge | Josh Steadmon | 2021-12-20 | 1 | -1/+1 |
| * | | | | | | | branch: add flags and config to inherit tracking | Josh Steadmon | 2021-12-20 | 16 | -23/+205 |
| * | | | | | | | branch: accept multiple upstream branches for tracking | Josh Steadmon | 2021-12-20 | 2 | -43/+106 |
* | | | | | | | | Merge branch 'ab/usage-die-message' | Junio C Hamano | 2022-01-10 | 9 | -34/+71 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config API: use get_error_routine(), not vreportf() | Ævar Arnfjörð Bjarmason | 2021-12-07 | 3 | -3/+3 |
| * | | | | | | | | usage.c + gc: add and use a die_message_errno() | Ævar Arnfjörð Bjarmason | 2021-12-07 | 3 | -6/+20 |
| * | | | | | | | | gc: return from cmd_gc(), don't call exit() | Ævar Arnfjörð Bjarmason | 2021-12-07 | 1 | -1/+2 |
| * | | | | | | | | usage.c API users: use die_message() for error() + exit 128 | Ævar Arnfjörð Bjarmason | 2021-12-07 | 1 | -4/+5 |
| * | | | | | | | | usage.c API users: use die_message() for "fatal :" + exit 128 | Ævar Arnfjörð Bjarmason | 2021-12-07 | 4 | -18/+15 |
| * | | | | | | | | usage.c: add a die_message() routine | Ævar Arnfjörð Bjarmason | 2021-12-07 | 2 | -3/+27 |
* | | | | | | | | | Merge branch 'jz/apply-3-corner-cases' | Junio C Hamano | 2022-01-10 | 2 | -1/+21 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-apply: skip threeway in add / rename cases | Jerry Zhang | 2021-12-20 | 2 | -1/+21 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'hn/reftable-fixes' | Junio C Hamano | 2022-01-10 | 8 | -11/+101 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | reftable: support preset file mode for writing | Han-Wen Nienhuys | 2021-12-23 | 3 | -10/+56 |
| * | | | | | | | | | reftable: signal overflow | Han-Wen Nienhuys | 2021-12-23 | 4 | -0/+44 |
| * | | | | | | | | | reftable: fix typo in header | Han-Wen Nienhuys | 2021-12-23 | 1 | -1/+1 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ab/reflog-prep' | Junio C Hamano | 2022-01-10 | 3 | -120/+150 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | reflog + refs-backend: move "verbose" out of the backend | Ævar Arnfjörð Bjarmason | 2021-12-22 | 3 | -35/+68 |
| * | | | | | | | | | refs files-backend: assume cb->newlog if !EXPIRE_REFLOGS_DRY_RUN | Ævar Arnfjörð Bjarmason | 2021-12-22 | 1 | -2/+2 |
| * | | | | | | | | | reflog: reduce scope of "struct rev_info" | Ævar Arnfjörð Bjarmason | 2021-12-22 | 1 | -6/+7 |
| * | | | | | | | | | reflog expire: don't use lookup_commit_reference_gently() | Ævar Arnfjörð Bjarmason | 2021-12-22 | 1 | -2/+1 |
| * | | | | | | | | | reflog expire: refactor & use "tip_commit" only for UE_NORMAL | Ævar Arnfjörð Bjarmason | 2021-12-22 | 1 | -7/+7 |
| * | | | | | | | | | reflog expire: use "switch" over enum values | Ævar Arnfjörð Bjarmason | 2021-12-22 | 1 | -24/+33 |
| * | | | | | | | | | reflog: change one->many worktree->refnames to use a string_list | Ævar Arnfjörð Bjarmason | 2021-12-22 | 1 | -29/+18 |