summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
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
2024-02-13add-patch: classify '@' as a synonym for 'HEAD'Ghanshyam Thakkar1-1/+3
2024-02-08Merge branch 'en/header-cleanup' into maint-2.43Junio C Hamano1-3/+0
2024-02-08Merge branch 'jc/orphan-unborn' into maint-2.43Junio C Hamano1-1/+1
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-3/+0
2024-01-02Merge branch 'jc/orphan-unborn'Junio C Hamano1-1/+1
2023-12-27Merge branch 'jc/checkout-B-branch-in-use'Junio C Hamano1-8/+29
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-3/+0
2023-12-13checkout: forbid "-B <branch>" from touching a branch used elsewhereJunio C Hamano1-0/+7
2023-12-09config: handle NULL value when parsing non-boolsJeff King1-0/+2
2023-11-24orphan/unborn: fix use of 'orphan' in end-user facing messagesJunio C Hamano1-1/+1
2023-11-23checkout: refactor die_if_checked_out() callerJunio C Hamano1-9/+23
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-3/+5
2023-10-02Merge branch 'jc/unresolve-removal'Junio C Hamano1-4/+11
2023-07-31checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano1-4/+2
2023-07-31checkout/restore: refuse unmerging paths unless checking out of the indexJunio C Hamano1-0/+9
2023-07-25Merge branch 'ah/advise-force-pushing'Junio C Hamano1-1/+1
2023-07-13wt-status: don't show divergence advice when committingAlex Henrie1-1/+1
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-3/+9
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-3/+9
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1