aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/checkout.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-08-05Merge branch 'ps/object-file-wo-the-repository'Junio C Hamano1-1/+1
2025-08-04Merge branch 'lm/add-p-context'Junio C Hamano1-3/+28
2025-07-29add-patch: add diff.context command line overridesLeon Michalak1-3/+28
2025-07-23config: drop `git_config_get_bool()` wrapperPatrick Steinhardt1-1/+1
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-1/+1
2025-07-16odb: introduce `odb_write_object()`Patrick Steinhardt1-1/+1
2025-07-15Merge branch 'ps/object-store'Junio C Hamano1-1/+1
2025-07-09Merge branch 'ps/object-store' into ps/object-file-wo-the-repositoryJunio C Hamano1-1/+1
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt1-1/+1
2025-06-03usage: allow dying without writing an error messagePatrick Steinhardt1-2/+2
2025-04-24Merge branch 'ps/object-file-cleanup'Junio C Hamano1-1/+2
2025-04-17Merge branch 'en/merge-recursive-debug'Junio C Hamano1-5/+5
2025-04-15object-store: merge "object-store-ll.h" and "object-store.h"Patrick Steinhardt1-1/+1
2025-04-15object-file: split out functions relating to object store subsystemPatrick Steinhardt1-0/+1
2025-04-08checkout: replace merge_trees() with merge_ort_nonrecursive()Elijah Newren1-5/+5
2025-03-10hash: stop depending on `the_repository` in `null_oid()`Patrick Steinhardt1-3/+3
2024-12-23Merge branch 'ps/build-sign-compare'Junio C Hamano1-0/+2
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+2
2024-12-03refs: drop strbuf_ prefix from helpersJunio C Hamano1-1/+1
2024-10-10checkout: refer to other-worktree branch, not refKristoffer Haugsbakk1-1/+1
2024-09-23Merge branch 'jc/pass-repo-to-builtins'Junio C Hamano1-3/+13
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai1-0/+1
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai1-3/+12
2024-09-12environment: stop storing "core.logAllRefUpdates" globallyPatrick Steinhardt1-0/+2
2024-09-12refs: stop modifying global `log_all_ref_updates` variablePatrick Steinhardt1-1/+2
2024-08-23Merge branch 'ps/config-wo-the-repository'Junio C Hamano1-1/+1
2024-08-15Merge branch 'jc/refs-symref-referent'Junio C Hamano1-1/+1
2024-08-13hooks: remove implicit dependency on `the_repository`Patrick Steinhardt1-1/+1
2024-08-09refs: add referent to each_ref_fnJohn Cai1-1/+1
2024-07-31Merge branch 'jc/checkout-no-op-switch-errors'Junio C Hamano1-7/+14
2024-07-13merge-recursive: honor diff.algorithmAntonin Delpeuch1-1/+1
2024-07-02checkout: special case error messages during noop switchingJunio C Hamano1-7/+14
2024-05-27checkout: clarify memory ownership in `unique_tracking_name()`Patrick Steinhardt1-6/+8
2024-05-20Merge branch 'kn/ref-transaction-symref'Junio C Hamano1-2/+2
2024-05-16Merge branch 'ps/refs-without-the-repository'Junio C Hamano1-13/+22
2024-05-07cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt1-13/+22
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-44/+43
2024-04-15Merge branch 'gt/add-u-commit-i-pathspec-check'Junio C Hamano1-1/+2
2024-04-12Merge branch 'jc/checkout-detach-wo-tracking-report'Junio C Hamano1-1/+2
2024-04-03revision: optionally record matches with pathspec elementsJunio C Hamano1-1/+2
2024-04-01Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano1-22/+38
2024-03-30checkout: omit "tracking" information on a detached HEADJunio C Hamano1-1/+2
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-3/+5
2024-03-25Merge branch 'rj/restore-plug-leaks'Junio C Hamano1-30/+21
2024-03-14checkout: plug some leaks in git-restoreRubén Justo1-30/+21
2024-03-14checkout: fix interaction between --conflict and --mergePhillip Wood1-3/+7
2024-03-14checkout: cleanup --conflict=<style> parsingPhillip Wood1-19/+32
2024-03-14merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood1-2/+1
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-3/+16
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin1-3/+16