summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
2022-01-18Merge branch 'js/branch-track-inherit'Libravatar Junio C Hamano1-3/+3
2022-01-18branch,checkout: fix --track usage stringsLibravatar Josh Steadmon1-3/+3
2022-01-10Merge branch 'ja/i18n-similar-messages'Libravatar Junio C Hamano1-9/+9
2022-01-10Merge branch 'js/branch-track-inherit'Libravatar Junio C Hamano1-2/+4
2022-01-05i18n: turn even more messages into "cannot be used together" onesLibravatar Jean-Noël Avila1-3/+3
2022-01-05i18n: factorize "--foo requires --bar" and the likeLibravatar Jean-Noël Avila1-1/+1
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Libravatar Jean-Noël Avila1-4/+4
2022-01-05i18n: refactor "foo and bar are mutually exclusive"Libravatar Jean-Noël Avila1-1/+1
2021-12-20branch: add flags and config to inherit trackingLibravatar Josh Steadmon1-2/+4
2021-12-15Merge branch 'en/zdiff3'Libravatar Junio C Hamano1-1/+1
2021-12-10Merge branch 'hn/create-reflog-simplify'Libravatar Junio C Hamano1-1/+1
2021-12-01update documentation for new zdiff3 conflictStyleLibravatar Elijah Newren1-1/+1
2021-11-22refs: drop force_create argument of create_reflog APILibravatar Han-Wen Nienhuys1-1/+1
2021-11-18checkout: fix "branch info" memory leaksLibravatar Ævar Arnfjörð Bjarmason1-31/+55
2021-09-27Change unpack_trees' 'reset' flag into an enumLibravatar Elijah Newren1-2/+3
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsLibravatar Elijah Newren1-9/+2
2021-09-27checkout, read-tree: fix leak of unpack_trees_options.dirLibravatar Elijah Newren1-0/+4
2021-09-10Merge branch 'ab/retire-advice-config'Libravatar Junio C Hamano1-3/+3
2021-08-26checkout: make delayed checkout respect --quiet and --no-progressLibravatar Matheus Tavares1-1/+1
2021-08-25advice: remove read uses of most global `advice_` variablesLibravatar Ben Boeckel1-3/+3
2021-07-14checkout: stop expanding sparse indexesLibravatar Derrick Stolee1-5/+3
2021-05-16Merge branch 'mt/parallel-checkout-part-3'Libravatar Junio C Hamano1-4/+18
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Libravatar Junio C Hamano1-3/+3
2021-05-07Merge branch 'ah/plugleaks'Libravatar Junio C Hamano1-0/+1
2021-05-05builtin/checkout.c: complete parallel checkout supportLibravatar Matheus Tavares1-4/+17
2021-05-05make_transient_cache_entry(): optionally alloc from mem_poolLibravatar Matheus Tavares1-1/+1
2021-04-30Merge branch 'ds/sparse-index-protections'Libravatar Junio C Hamano1-0/+5
2021-04-28builtin/checkout: clear pending objects after diffingLibravatar Andrzej Hunt1-0/+1
2021-04-27hash: provide per-algorithm null OIDsLibravatar brian m. carlson1-3/+3
2021-04-14checkout: ensure full indexLibravatar Derrick Stolee1-0/+5
2021-04-02Merge branch 'mt/parallel-checkout-part-1'Libravatar Junio C Hamano1-0/+1
2021-03-23entry: extract a header file for entry.c functionsLibravatar Matheus Tavares1-0/+1
2021-03-20tree.h API: simplify read_tree_recursive() signatureLibravatar Ævar Arnfjörð Bjarmason1-4/+4
2021-01-23cache-tree: clean up cache_tree_update()Libravatar Derrick Stolee1-3/+0
2020-12-23Merge branch 'dl/checkout-p-merge-base'Libravatar Junio C Hamano1-2/+4
2020-12-21checkout -p: handle tree arguments correctly againLibravatar Johannes Schindelin1-2/+4
2020-11-11Merge branch 'rs/clear-commit-marks-in-repo'Libravatar Junio C Hamano1-1/+1
2020-10-31object: allow clear_commit_marks_all to handle any repoLibravatar René Scharfe1-1/+1
2020-10-27Merge branch 'dl/checkout-guess'Libravatar Junio C Hamano1-1/+6
2020-10-27Merge branch 'dl/checkout-p-merge-base'Libravatar Junio C Hamano1-1/+14
2020-10-08checkout: learn to respect checkout.guessLibravatar Denton Liu1-1/+6
2020-10-07builtin/checkout: fix `git checkout -p HEAD...` bugLibravatar Denton Liu1-1/+14
2020-09-09Merge branch 'jt/interpret-branch-name-fallback'Libravatar Junio C Hamano1-2/+2
2020-09-02wt-status: tolerate dangling marksLibravatar Jonathan Tan1-2/+2
2020-08-31Merge branch 'rs/checkout-no-overlay-pathspec-fix'Libravatar Junio C Hamano1-0/+2
2020-08-27Merge branch 'jk/leakfix'Libravatar Junio C Hamano1-1/+3
2020-08-22checkout, restore: make pathspec recursiveLibravatar René Scharfe1-0/+2
2020-08-14checkout: fix leak of non-existent branch namesLibravatar Jeff King1-1/+3
2020-08-03checkout: support renormalization with checkout -m <paths>Libravatar Elijah Newren1-5/+6
2020-08-03merge: make merge.renormalize work for all uses of merge machineryLibravatar Elijah Newren1-7/+0