summaryrefslogtreecommitdiffstats
path: root/builtin/checkout.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ps/build-sign-compare'Junio C Hamano2024-12-231-0/+2
|\
| * global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt2024-12-061-0/+2
* | refs: drop strbuf_ prefix from helpersJunio C Hamano2024-12-031-1/+1
|/
* checkout: refer to other-worktree branch, not refKristoffer Haugsbakk2024-10-101-1/+1
* Merge branch 'jc/pass-repo-to-builtins'Junio C Hamano2024-09-231-3/+13
|\
| * builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai2024-09-131-0/+1
| * builtin: add a repository parameter for builtin functionsJohn Cai2024-09-131-3/+12
* | environment: stop storing "core.logAllRefUpdates" globallyPatrick Steinhardt2024-09-121-0/+2
* | refs: stop modifying global `log_all_ref_updates` variablePatrick Steinhardt2024-09-121-1/+2
|/
* Merge branch 'ps/config-wo-the-repository'Junio C Hamano2024-08-231-1/+1
|\
| * hooks: remove implicit dependency on `the_repository`Patrick Steinhardt2024-08-131-1/+1
* | Merge branch 'jc/refs-symref-referent'Junio C Hamano2024-08-151-1/+1
|\ \ | |/ |/|
| * refs: add referent to each_ref_fnJohn Cai2024-08-091-1/+1
* | Merge branch 'jc/checkout-no-op-switch-errors'Junio C Hamano2024-07-311-7/+14
|\ \
| * | checkout: special case error messages during noop switchingJunio C Hamano2024-07-021-7/+14
| * | Merge branch 'en/header-cleanup' into maint-2.43Junio C Hamano2024-02-091-3/+0
| |\ \
| * \ \ Merge branch 'jc/orphan-unborn' into maint-2.43Junio C Hamano2024-02-091-1/+1
| |\ \ \
* | | | | merge-recursive: honor diff.algorithmAntonin Delpeuch2024-07-141-1/+1
| |_|_|/ |/| | |
* | | | checkout: clarify memory ownership in `unique_tracking_name()`Patrick Steinhardt2024-05-271-6/+8
* | | | Merge branch 'kn/ref-transaction-symref'Junio C Hamano2024-05-201-2/+2
|\ \ \ \
* \ \ \ \ Merge branch 'ps/refs-without-the-repository'Junio C Hamano2024-05-161-13/+22
|\ \ \ \ \
| * | | | | cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt2024-05-071-13/+22
* | | | | | builtin: stop using `the_index`Patrick Steinhardt2024-04-181-44/+43
|/ / / / /
* | | | | Merge branch 'gt/add-u-commit-i-pathspec-check'Junio C Hamano2024-04-151-1/+2
|\ \ \ \ \
| * | | | | revision: optionally record matches with pathspec elementsJunio C Hamano2024-04-031-1/+2
* | | | | | Merge branch 'jc/checkout-detach-wo-tracking-report'Junio C Hamano2024-04-121-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | checkout: omit "tracking" information on a detached HEADJunio C Hamano2024-03-311-1/+2
| |/ / / /
* | | | | Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano2024-04-011-22/+38
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | checkout: fix interaction between --conflict and --mergePhillip Wood2024-03-141-3/+7
| * | | | checkout: cleanup --conflict=<style> parsingPhillip Wood2024-03-141-19/+32
| * | | | merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood2024-03-141-2/+1
* | | | | Merge branch 'eb/hash-transition'Junio C Hamano2024-03-281-3/+5
|\ \ \ \ \
| * | | | | tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman2023-10-021-3/+5
* | | | | | Merge branch 'rj/restore-plug-leaks'Junio C Hamano2024-03-261-30/+21
|\ \ \ \ \ \
| * | | | | | checkout: plug some leaks in git-restoreRubén Justo2024-03-141-30/+21
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/merge-tree-3-trees'Junio C Hamano2024-03-081-3/+16
|\ \ \ \ \ \
| * | | | | | Always check `parse_tree*()`'s return valueJohannes Schindelin2024-02-231-3/+16
* | | | | | | add-patch: classify '@' as a synonym for 'HEAD'Ghanshyam Thakkar2024-02-131-1/+3
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'en/header-cleanup'Junio C Hamano2024-01-081-3/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-3/+0
| |/ / / /
* | | | | Merge branch 'jc/orphan-unborn'Junio C Hamano2024-01-021-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | orphan/unborn: fix use of 'orphan' in end-user facing messagesJunio C Hamano2023-11-241-1/+1
| |/ / /
* | | | Merge branch 'jc/checkout-B-branch-in-use'Junio C Hamano2023-12-271-8/+29
|\ \ \ \ | |_|_|/ |/| | |
| * | | checkout: forbid "-B <branch>" from touching a branch used elsewhereJunio C Hamano2023-12-131-0/+7
| * | | checkout: refactor die_if_checked_out() callerJunio C Hamano2023-11-231-9/+23
| |/ /
* / / config: handle NULL value when parsing non-boolsJeff King2023-12-091-0/+2
|/ /
* | Merge branch 'jc/unresolve-removal'Junio C Hamano2023-10-021-4/+11
|\ \ | |/ |/|
| * checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano2023-08-011-4/+2
| * checkout/restore: refuse unmerging paths unless checking out of the indexJunio C Hamano2023-08-011-0/+9
* | Merge branch 'ah/advise-force-pushing'Junio C Hamano2023-07-251-1/+1
|\ \