aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | i18n: refactor "%s, %s and %s are mutually exclusive"Gravatar Jean-Noël Avila 2022-01-055-7/+7
| * | | | | | | | | | | i18n: refactor "foo and bar are mutually exclusive"Gravatar Jean-Noël Avila 2022-01-0510-13/+13
* | | | | | | | | | | | Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix'Gravatar Junio C Hamano 13 days2-3/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge-ort: fix bug with renormalization and rename/delete conflictsGravatar Elijah Newren 2021-12-302-3/+42
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/doc-submitting-patches-choice-of-base'Gravatar Junio C Hamano 13 days1-14/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | SubmittingPatchs: clarify choice of base and testingGravatar Junio C Hamano 2021-12-301-14/+39
* | | | | | | | | | | | | Merge branch 'jl/subtree-check-parents-argument-passing-fix'Gravatar Junio C Hamano 13 days1-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | subtree: fix argument handling in check_parentsGravatar James Limbouris 2022-01-041-4/+3
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'lh/use-gnu-color-in-grep'Gravatar Junio C Hamano 13 days1-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | grep: align default colors with GNU grep onesGravatar Lénaïc Huard 2022-01-051-3/+3
* | | | | | | | | | | | | | Merge branch 'js/branch-track-inherit'Gravatar Junio C Hamano 13 days16-67/+312
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | config: require lowercase for branch.*.autosetupmergeGravatar Josh Steadmon 2021-12-201-1/+1
| * | | | | | | | | | | | | branch: add flags and config to inherit trackingGravatar Josh Steadmon 2021-12-2016-23/+205
| * | | | | | | | | | | | | branch: accept multiple upstream branches for trackingGravatar Josh Steadmon 2021-12-202-43/+106
* | | | | | | | | | | | | | Merge branch 'ab/usage-die-message'Gravatar Junio C Hamano 13 days9-34/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | config API: use get_error_routine(), not vreportf()Gravatar Ævar Arnfjörð Bjarmason 2021-12-073-3/+3
| * | | | | | | | | | | | | | usage.c + gc: add and use a die_message_errno()Gravatar Ævar Arnfjörð Bjarmason 2021-12-073-6/+20
| * | | | | | | | | | | | | | gc: return from cmd_gc(), don't call exit()Gravatar Ævar Arnfjörð Bjarmason 2021-12-071-1/+2
| * | | | | | | | | | | | | | usage.c API users: use die_message() for error() + exit 128Gravatar Ævar Arnfjörð Bjarmason 2021-12-071-4/+5
| * | | | | | | | | | | | | | usage.c API users: use die_message() for "fatal :" + exit 128Gravatar Ævar Arnfjörð Bjarmason 2021-12-074-18/+15
| * | | | | | | | | | | | | | usage.c: add a die_message() routineGravatar Ævar Arnfjörð Bjarmason 2021-12-072-3/+27
* | | | | | | | | | | | | | | Merge branch 'jz/apply-3-corner-cases'Gravatar Junio C Hamano 13 days2-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-apply: skip threeway in add / rename casesGravatar Jerry Zhang 2021-12-202-1/+21
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'hn/reftable-fixes'Gravatar Junio C Hamano 13 days8-11/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | reftable: support preset file mode for writingGravatar Han-Wen Nienhuys 2021-12-233-10/+56
| * | | | | | | | | | | | | | | reftable: signal overflowGravatar Han-Wen Nienhuys 2021-12-234-0/+44
| * | | | | | | | | | | | | | | reftable: fix typo in headerGravatar Han-Wen Nienhuys 2021-12-231-1/+1
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ab/reflog-prep'Gravatar Junio C Hamano 13 days3-120/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | reflog + refs-backend: move "verbose" out of the backendGravatar Ævar Arnfjörð Bjarmason 2021-12-223-35/+68
| * | | | | | | | | | | | | | | refs files-backend: assume cb->newlog if !EXPIRE_REFLOGS_DRY_RUNGravatar Ævar Arnfjörð Bjarmason 2021-12-221-2/+2
| * | | | | | | | | | | | | | | reflog: reduce scope of "struct rev_info"Gravatar Ævar Arnfjörð Bjarmason 2021-12-221-6/+7
| * | | | | | | | | | | | | | | reflog expire: don't use lookup_commit_reference_gently()Gravatar Ævar Arnfjörð Bjarmason 2021-12-221-2/+1
| * | | | | | | | | | | | | | | reflog expire: refactor & use "tip_commit" only for UE_NORMALGravatar Ævar Arnfjörð Bjarmason 2021-12-221-7/+7
| * | | | | | | | | | | | | | | reflog expire: use "switch" over enum valuesGravatar Ævar Arnfjörð Bjarmason 2021-12-221-24/+33
| * | | | | | | | | | | | | | | reflog: change one->many worktree->refnames to use a string_listGravatar Ævar Arnfjörð Bjarmason 2021-12-221-29/+18
| * | | | | | | | | | | | | | | reflog expire: narrow scope of "cb" in cmd_reflog_expire()Gravatar Ævar Arnfjörð Bjarmason 2021-12-221-16/+15
| * | | | | | | | | | | | | | | reflog delete: narrow scope of "cmd" passed to count_reflog_ent()Gravatar Ævar Arnfjörð Bjarmason 2021-12-221-11/+11
* | | | | | | | | | | | | | | | Merge branch 'ab/do-not-limit-stash-help-to-push'Gravatar Junio C Hamano 13 days2-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | stash: don't show "git stash push" usage on bad "git stash" usageGravatar Ævar Arnfjörð Bjarmason 2021-12-162-0/+20
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ab/makefile-hook-list-dependency-fix'Gravatar Junio C Hamano 13 days1-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Makefile: correct the dependency graph of hook-list.hGravatar Ævar Arnfjörð Bjarmason 2021-12-251-2/+2
* | | | | | | | | | | | | | | | | Merge branch 'ab/makefile-pager-env-is-used-only-by-pager.c'Gravatar Junio C Hamano 13 days1-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Makefile: move -DPAGER_ENV from BASIC_CFLAGS to EXTRA_CPPFLAGSGravatar Ævar Arnfjörð Bjarmason 2021-12-251-5/+6
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ab/makefile-msgfmt-wo-stats'Gravatar Junio C Hamano 13 days1-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Makefile: don't invoke msgfmt with --statisticsGravatar Ævar Arnfjörð Bjarmason 2021-12-251-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'hn/refs-debug-update'Gravatar Junio C Hamano 13 days6-20/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | refs: centralize initialization of the base ref_store.Gravatar Han-Wen Nienhuys 2021-12-225-13/+11
| * | | | | | | | | | | | | | | | | refs: print error message in debug outputGravatar Han-Wen Nienhuys 2021-12-221-1/+2
| * | | | | | | | | | | | | | | | | refs: pass gitdir to packed_ref_store_createGravatar Han-Wen Nienhuys 2021-12-223-8/+8
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ds/fetch-pull-with-sparse-index'Gravatar Junio C Hamano 13 days8-82/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \