aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
2021-09-10Merge branch 'ab/retire-advice-config'Junio C Hamano1-3/+3
2021-08-26checkout: make delayed checkout respect --quiet and --no-progressMatheus Tavares1-1/+1
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel1-3/+3
2021-07-14checkout: stop expanding sparse indexesDerrick Stolee1-5/+3
2021-05-16Merge branch 'mt/parallel-checkout-part-3'Junio C Hamano1-4/+18
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano1-3/+3
2021-05-07Merge branch 'ah/plugleaks'Junio C Hamano1-0/+1
2021-05-05builtin/checkout.c: complete parallel checkout supportMatheus Tavares1-4/+17
2021-05-05make_transient_cache_entry(): optionally alloc from mem_poolMatheus Tavares1-1/+1
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano1-0/+5
2021-04-28builtin/checkout: clear pending objects after diffingAndrzej Hunt1-0/+1
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-3/+3
2021-04-14checkout: ensure full indexDerrick Stolee1-0/+5
2021-04-02Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano1-0/+1
2021-03-23entry: extract a header file for entry.c functionsMatheus Tavares1-0/+1
2021-03-20tree.h API: simplify read_tree_recursive() signatureÆvar Arnfjörð Bjarmason1-4/+4
2021-01-23cache-tree: clean up cache_tree_update()Derrick Stolee1-3/+0
2020-12-23Merge branch 'dl/checkout-p-merge-base'Junio C Hamano1-2/+4
2020-12-21checkout -p: handle tree arguments correctly againJohannes Schindelin1-2/+4
2020-11-11Merge branch 'rs/clear-commit-marks-in-repo'Junio C Hamano1-1/+1
2020-10-31object: allow clear_commit_marks_all to handle any repoRené Scharfe1-1/+1
2020-10-27Merge branch 'dl/checkout-guess'Junio C Hamano1-1/+6
2020-10-27Merge branch 'dl/checkout-p-merge-base'Junio C Hamano1-1/+14
2020-10-08checkout: learn to respect checkout.guessDenton Liu1-1/+6
2020-10-07builtin/checkout: fix `git checkout -p HEAD...` bugDenton Liu1-1/+14
2020-09-09Merge branch 'jt/interpret-branch-name-fallback'Junio C Hamano1-2/+2
2020-09-02wt-status: tolerate dangling marksJonathan Tan1-2/+2
2020-08-31Merge branch 'rs/checkout-no-overlay-pathspec-fix'Junio C Hamano1-0/+2
2020-08-27Merge branch 'jk/leakfix'Junio C Hamano1-1/+3
2020-08-22checkout, restore: make pathspec recursiveRené Scharfe1-0/+2
2020-08-14checkout: fix leak of non-existent branch namesJeff King1-1/+3
2020-08-03checkout: support renormalization with checkout -m <paths>Elijah Newren1-5/+6
2020-08-03merge: make merge.renormalize work for all uses of merge machineryElijah Newren1-7/+0
2020-06-08Merge branch 'bc/filter-process'Junio C Hamano1-3/+1
2020-05-24checkout: improve error messages for -b with extra argumentRené Scharfe1-1/+1
2020-05-21builtin/checkout: simplify metadata initializationbrian m. carlson1-3/+1
2020-05-08Merge branch 'es/restore-staged-from-head-by-default'Junio C Hamano1-3/+3
2020-05-08Merge branch 'dl/switch-c-option-in-error-message'Junio C Hamano1-4/+10
2020-05-05restore: default to HEAD when combining --staged and --worktreeEric Sunshine1-3/+3
2020-04-30switch: fix errors and comments related to -c and -CDenton Liu1-4/+10
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu1-2/+2
2020-03-16builtin/checkout: compute checkout metadata for checkoutsbrian m. carlson1-4/+14
2020-03-16convert: provide additional metadata to filtersbrian m. carlson1-0/+13
2020-03-12builtin/checkout: pass branch info down to checkout_worktreebrian m. carlson1-16/+17
2020-02-17Merge branch 'rs/strbuf-insertstr'Junio C Hamano1-1/+1
2020-02-10strbuf: add and use strbuf_insertstr()René Scharfe1-1/+1
2020-02-05Merge branch 'am/checkout-file-and-ref-ref-ambiguity'Junio C Hamano1-32/+39
2020-01-22Merge branch 'nd/switch-and-restore'Junio C Hamano1-0/+2
2020-01-08restore: invalidate cache-tree when removing entries with --stagedJeff King1-0/+2
2020-01-07checkout: don't revert file on ambiguous tracking branchesAlexandr Miloslavskiy1-31/+25
2020-01-07parse_branchname_arg(): extract part as new functionAlexandr Miloslavskiy1-6/+19
2019-12-04checkout, restore: support the --pathspec-from-file optionAlexandr Miloslavskiy1-4/+27
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano1-4/+10
2019-09-30Merge branch 'nd/switch-and-restore'Junio C Hamano1-0/+9
2019-09-09Merge branch 'en/checkout-mismerge-fix'Junio C Hamano1-7/+0
2019-08-30checkout: add simple check for 'git checkout -b'Derrick Stolee1-0/+9
2019-08-22Merge branch 'vn/restore-empty-ita-corner-case-fix'Junio C Hamano1-0/+1
2019-08-19cache-tree: share code between functions writing an index as a treeElijah Newren1-1/+1
2019-08-19merge-recursive: remove useless parameter in merge_trees()Elijah Newren1-3/+1
2019-08-16checkout: provide better conflict hunk description with detached HEADElijah Newren1-0/+8
2019-08-16checkout: remove duplicate codeElijah Newren1-7/+0
2019-08-06l10n: reformat some localized strings for v2.23.0Jean-Noël Avila1-1/+1
2019-08-02checkout.c: unstage empty deleted ita filesVarun Naik1-0/+1
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-320/+584
2019-06-20switch: allow to switch in the middle of bisectNguyễn Thái Ngọc Duy1-3/+1
2019-05-07restore: support --patchNguyễn Thái Ngọc Duy1-2/+4
2019-05-07restore: replace --force with --ignore-unmergedNguyễn Thái Ngọc Duy1-9/+20
2019-05-07restore: default to --source=HEAD when only --staged is specifiedNguyễn Thái Ngọc Duy1-0/+6
2019-05-07restore: reject invalid combinations with --stagedNguyễn Thái Ngọc Duy1-0/+10
2019-05-07restore: add --worktree and --stagedNguyễn Thái Ngọc Duy1-6/+68
2019-05-07checkout: factor out worktree checkout codeNguyễn Thái Ngọc Duy1-49/+59
2019-05-07restore: disable overlay mode by defaultNguyễn Thái Ngọc Duy1-4/+7
2019-05-07restore: make pathspec mandatoryNguyễn Thái Ngọc Duy1-0/+7
2019-05-07restore: take tree-ish from --source option insteadNguyễn Thái Ngọc Duy1-8/+34
2019-05-07checkout: split part of it to new command 'restore'Nguyễn Thái Ngọc Duy1-0/+26
2019-04-25Merge branch 'nd/checkout-m'Junio C Hamano1-2/+9
2019-04-25Merge branch 'jk/unused-params-even-more'Junio C Hamano1-1/+1
2019-04-16Merge branch 'nd/checkout-m-doc-update'Junio C Hamano1-0/+9
2019-04-02switch: make --orphan switch to an empty treeNguyễn Thái Ngọc Duy1-8/+31
2019-04-02switch: reject if some operation is in progressNguyễn Thái Ngọc Duy1-0/+40
2019-04-02switch: no worktree status unless real branch switch happensNguyễn Thái Ngọc Duy1-126/+8
2019-04-02switch: implicit dwim, use --no-guess to disable itNguyễn Thái Ngọc Duy1-8/+8
2019-04-02switch: add short option for --detachNguyễn Thái Ngọc Duy1-1/+1
2019-04-02switch: only allow explicit detached HEADNguyễn Thái Ngọc Duy1-0/+34
2019-04-02switch: reject "do nothing" caseNguyễn Thái Ngọc Duy1-0/+9
2019-04-02switch: stop accepting pathspecNguyễn Thái Ngọc Duy1-5/+15
2019-04-02switch: remove -lNguyễn Thái Ngọc Duy1-1/+1
2019-04-02switch: add --discard-changesNguyễn Thái Ngọc Duy1-2/+10
2019-04-02switch: better names for -b and -BNguyễn Thái Ngọc Duy1-11/+21
2019-04-02checkout: split part of it to new command 'switch'Nguyễn Thái Ngọc Duy1-12/+48
2019-04-02checkout: split options[] array in three piecesNguyễn Thái Ngọc Duy1-23/+59
2019-04-02checkout: move 'confict_style' and 'dwim_..' to checkout_optsNguyễn Thái Ngọc Duy1-7/+10
2019-04-02checkout: make "opts" in cmd_checkout() a pointerNguyễn Thái Ngọc Duy1-57/+58
2019-04-02checkout: factor out some code in parse_branchname_arg()Nguyễn Thái Ngọc Duy1-20/+31
2019-04-02checkout: keep most #include sortedNguyễn Thái Ngọc Duy1-17/+17
2019-04-02checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy1-1/+1
2019-03-24checkout: prevent losing staged changes with --mergeNguyễn Thái Ngọc Duy1-1/+10
2019-03-24unpack-trees: rename "gently" flag to "quiet"Nguyễn Thái Ngọc Duy1-1/+1
2019-03-21checkout.txt: note about losing staged changes with --mergeNguyễn Thái Ngọc Duy1-0/+9
2019-03-20report_path_error(): drop unused prefix parameterJeff King1-1/+1
2019-03-07Merge branch 'jh/trace2'Junio C Hamano1-0/+7
2019-03-07Merge branch 'tg/checkout-no-overlay'Junio C Hamano1-35/+92
2019-02-22trace2:data: add subverb to checkout commandJeff Hostetler1-0/+7
2019-02-08Merge branch 'nd/checkout-noisy-unmerge'Junio C Hamano1-7/+12
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-2/+3
2019-02-06checkout: count and print -m paths separatelyNguyễn Thái Ngọc Duy1-3/+8
2019-02-06checkout: update count-checkouts messagesNguyễn Thái Ngọc Duy1-4/+4
2019-02-05Merge branch 'bp/checkout-new-branch-optim'Junio C Hamano1-0/+8
2019-02-04revert "checkout: introduce checkout.overlayMode config"Thomas Gummerer1-7/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy1-0/+1
2019-01-23checkout: fix regression in checkout -b on intitial checkoutBen Peart1-0/+8
2019-01-14Merge branch 'nd/checkout-noisy'Junio C Hamano1-8/+31
2019-01-14Merge branch 'nd/attr-pathspec-in-tree-walk'Junio C Hamano1-1/+2
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2019-01-14checkout: avoid the_index when possibleNguyễn Thái Ngọc Duy1-1/+1
2019-01-08checkout: introduce checkout.overlayMode configThomas Gummerer1-1/+7
2019-01-08checkout: introduce --{,no-}overlay optionThomas Gummerer1-8/+58
2019-01-04Merge branch 'nd/checkout-dwim-fix'Junio C Hamano1-5/+13
2019-01-02checkout: factor out mark_cache_entry_for_checkout functionThomas Gummerer1-31/+36
2019-01-02checkout: clarify commentThomas Gummerer1-4/+4
2018-11-19tree.c: make read_tree*() take 'struct repository *'Nguyễn Thái Ngọc Duy1-1/+2
2018-11-14checkout: print something when checking out pathsNguyễn Thái Ngọc Duy1-8/+31
2018-11-14checkout: disambiguate dwim tracking branches and local filesNguyễn Thái Ngọc Duy1-5/+13
2018-11-12branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy1-2/+3
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-3/+4
2018-10-04more oideq/hasheq conversionsJeff King1-1/+2
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-2/+2
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+2
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-1/+1
2018-09-17Merge branch 'bp/checkout-new-branch-optim'Junio C Hamano1-4/+116
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-1/+1
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano1-1/+1
2018-08-16checkout: optimize "git checkout -b <new_branch>"Ben Peart1-4/+116
2018-08-15Merge branch 'nd/i18n'Junio C Hamano1-2/+2
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano1-4/+4
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano1-3/+3
2018-08-02Merge branch 'ab/checkout-default-remote'Junio C Hamano1-8/+33
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy1-2/+2
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-0/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller1-4/+4
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller1-1/+1
2018-06-29commit: add repository argument to lookup_commit_reference_gentlyStefan Beller1-3/+3
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-0/+1
2018-06-28Merge branch 'nd/completion-negation'Junio C Hamano1-4/+6
2018-06-11checkout & worktree: introduce checkout.defaultRemoteÆvar Arnfjörð Bjarmason1-3/+9
2018-06-11checkout: add advice for ambiguous "checkout <branch>"Ævar Arnfjörð Bjarmason1-0/+13
2018-06-11builtin/checkout.c: use "ret" variable for returnÆvar Arnfjörð Bjarmason1-3/+5
2018-06-11checkout: pass the "num_matches" up to callersÆvar Arnfjörð Bjarmason1-3/+7
2018-05-30Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano1-0/+1
2018-05-29completion: suppress some -no- optionsNguyễn Thái Ngọc Duy1-4/+6
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano1-6/+12
2018-05-22unpack_trees_options: free messages when doneMartin Ågren1-0/+1
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee1-6/+12
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee1-6/+6
2018-04-11Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano1-98/+98
2018-04-10Merge branch 'bc/object-id'Junio C Hamano1-6/+6
2018-03-14Merge branch 'nd/parseopt-completion'Junio C Hamano1-2/+5
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson1-3/+3
2018-03-14strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson1-1/+1
2018-03-14tree: convert read_tree_recursive to struct object_idbrian m. carlson1-2/+2
2018-03-08Merge branch 'jh/status-no-ahead-behind'Junio C Hamano1-1/+1
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano1-98/+98
2018-02-22checkout: rename 'new' variablesBrandon Williams1-98/+98
2018-02-09completion: use __gitcomp_builtin in _git_checkoutNguyễn Thái Ngọc Duy1-2/+5
2018-02-09parse-options: let OPT__FORCE take optional flags argumentNguyễn Thái Ngọc Duy1-1/+1
2018-01-30sha1_file: convert write_sha1_file to object_idPatryk Obara1-2/+1
2018-01-24status: support --no-ahead-behind in long formatJeff Hostetler1-1/+1
2018-01-23Merge branch 'rs/lose-leak-pending'Junio C Hamano1-12/+1
2017-12-28checkout: avoid using the rev_info flag leak_pendingRené Scharfe1-12/+1
2017-12-27Merge branch 'ks/branch-cleanup'Junio C Hamano1-1/+1
2017-12-19Merge branch 'ar/unconfuse-three-dots'Junio C Hamano1-2/+8
2017-12-19Merge branch 'tg/worktree-create-tracking'Junio C Hamano1-40/+1
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano1-1/+1
2017-12-07branch: group related arguments of create_branch()Kaartic Sivaraam1-1/+1
2017-12-06checkout: describe_detached_head: remove ellipsis after committishAnn T Ropea1-2/+8
2017-11-28Merge branch 'jc/branch-name-sanity'Junio C Hamano1-5/+5
2017-11-27checkout: factor out functions to new lib fileThomas Gummerer1-40/+1
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano1-1/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-1/+1
2017-11-06Merge branch 'bc/object-id'Junio C Hamano1-5/+5
2017-11-06Merge branch 'ma/lockfile-fixes'Junio C Hamano1-8/+6
2017-11-06refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty1-1/+1
2017-10-16refs: convert read_ref and read_ref_full to object_idbrian m. carlson1-3/+3
2017-10-16refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson1-1/+1
2017-10-13branch: split validate_new_branchname() into twoJunio C Hamano1-5/+5
2017-10-07Merge branch 'ma/builtin-unleak'Junio C Hamano1-0/+1
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren1-8/+6
2017-10-05Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano1-2/+1
2017-10-02builtin/: add UNLEAKsMartin Ågren1-0/+1
2017-10-01refs: pass NULL to resolve_refdup() if hash is not neededRené Scharfe1-2/+1
2017-09-29Merge branch 'ma/leakplugs'Junio C Hamano1-1/+8
2017-09-24leak_pending: use `object_array_clear()`, not `free()`Martin Ågren1-1/+8
2017-09-22consistently use "fallthrough" comments in switchesJeff King1-0/+1
2017-08-26Merge branch 'bw/submodule-config-cleanup'Junio C Hamano1-2/+1
2017-08-11Merge branch 'ls/filter-process-delayed'Junio C Hamano1-0/+3
2017-08-03submodule: remove gitmodules_configBrandon Williams1-1/+0
2017-08-03unpack-trees: don't respect submodule.updateBrandon Williams1-1/+1
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-09 03:14:28 +0000