summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)Author
12 daysMerge branch 'gt/add-u-commit-i-pathspec-check'Junio C Hamano
2024-04-12Merge branch 'jc/checkout-detach-wo-tracking-report'Junio C Hamano
2024-04-03revision: optionally record matches with pathspec elementsJunio C Hamano
2024-04-01Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano
2024-03-31checkout: omit "tracking" information on a detached HEADJunio C Hamano
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano
2024-03-25Merge branch 'rj/restore-plug-leaks'Junio C Hamano
2024-03-14checkout: plug some leaks in git-restoreRubén Justo
2024-03-14checkout: fix interaction between --conflict and --mergePhillip Wood
2024-03-14checkout: cleanup --conflict=<style> parsingPhillip Wood
2024-03-14merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin
2024-02-13add-patch: classify '@' as a synonym for 'HEAD'Ghanshyam Thakkar
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano
2024-01-02Merge branch 'jc/orphan-unborn'Junio C Hamano
2023-12-27Merge branch 'jc/checkout-B-branch-in-use'Junio C Hamano
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-12-13checkout: forbid "-B <branch>" from touching a branch used elsewhereJunio C Hamano
2023-12-08config: handle NULL value when parsing non-boolsJeff King
2023-11-24orphan/unborn: fix use of 'orphan' in end-user facing messagesJunio C Hamano
2023-11-23checkout: refactor die_if_checked_out() callerJunio C Hamano
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman
2023-10-02Merge branch 'jc/unresolve-removal'Junio C Hamano
2023-07-31checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano
2023-07-31checkout/restore: refuse unmerging paths unless checking out of the indexJunio C Hamano
2023-07-25Merge branch 'ah/advise-force-pushing'Junio C Hamano
2023-07-13wt-status: don't show divergence advice when committingAlex Henrie
2023-07-06Merge branch 'gc/config-context'Junio C Hamano
2023-06-28config: add ctx arg to config_fn_tGlen Choo
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren
2023-06-21merge-ll: rename from ll-mergeElijah Newren
2023-06-21repository: remove unnecessary include of path.hElijah Newren
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren
2023-06-21preload-index.h: move declarations for preload-index.c from elsewhereElijah Newren
2023-06-21add: modify add_files_to_cache() to avoid globalsElijah Newren
2023-04-24symlinks.h: move declarations for symlinks.c functions from cache.hElijah Newren
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren
2023-04-11treewide: be explicit about dependence on mem-pool.hElijah Newren
2023-04-11treewide: be explicit about dependence on trace.h & trace2.hElijah Newren
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano
2023-03-28cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-21setup.h: move declarations for setup.c functions from cache.hElijah Newren
2023-03-21environment.h: move declarations for environment.c functions from cache.hElijah Newren
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren
2023-03-19Merge branch 'jk/bundle-use-dash-for-stdfiles'Junio C Hamano
2023-03-19Merge branch 'ak/restore-both-incompatible-with-conflicts'Junio C Hamano
2023-03-06parse-options: consistently allocate memory in fix_filename()Jeff King