summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)Author
4 daysMerge branch 'js/branch-track-inherit'HEADmastermainJunio C Hamano
4 daysbranch,checkout: fix --track documentationRené Scharfe
6 daysMerge branch 'js/branch-track-inherit'Junio C Hamano
6 daysbranch,checkout: fix --track usage stringsJosh Steadmon
14 daysMerge branch 'ja/i18n-similar-messages'Junio C Hamano
14 daysMerge branch 'js/branch-track-inherit'Junio C Hamano
2022-01-05i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila
2022-01-05i18n: factorize "--foo requires --bar" and the likeJean-Noël Avila
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila
2022-01-05i18n: refactor "foo and bar are mutually exclusive"Jean-Noël Avila
2021-12-21branch: add flags and config to inherit trackingJosh Steadmon
2021-12-15Merge branch 'en/zdiff3'Junio C Hamano
2021-12-10Merge branch 'hn/create-reflog-simplify'Junio C Hamano
2021-12-01update documentation for new zdiff3 conflictStyleElijah Newren
2021-11-22refs: drop force_create argument of create_reflog APIHan-Wen Nienhuys
2021-11-18checkout: fix "branch info" memory leaksÆvar Arnfjörð Bjarmason
2021-09-27Change unpack_trees' 'reset' flag into an enumElijah Newren
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren
2021-09-27checkout, read-tree: fix leak of unpack_trees_options.dirElijah Newren
2021-09-10Merge branch 'ab/retire-advice-config'Junio C Hamano
2021-08-27checkout: make delayed checkout respect --quiet and --no-progressMatheus Tavares
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel
2021-07-14checkout: stop expanding sparse indexesDerrick Stolee
2021-05-16Merge branch 'mt/parallel-checkout-part-3'Junio C Hamano
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano
2021-05-07Merge branch 'ah/plugleaks'Junio C Hamano
2021-05-05builtin/checkout.c: complete parallel checkout supportMatheus Tavares
2021-05-05make_transient_cache_entry(): optionally alloc from mem_poolMatheus Tavares
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano
2021-04-28builtin/checkout: clear pending objects after diffingAndrzej Hunt
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson
2021-04-14checkout: ensure full indexDerrick Stolee
2021-04-02Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano
2021-03-23entry: extract a header file for entry.c functionsMatheus Tavares
2021-03-20tree.h API: simplify read_tree_recursive() signatureÆvar Arnfjörð Bjarmason
2021-01-24cache-tree: clean up cache_tree_update()Derrick Stolee
2020-12-23Merge branch 'dl/checkout-p-merge-base'Junio C Hamano
2020-12-21checkout -p: handle tree arguments correctly againJohannes Schindelin
2020-11-11Merge branch 'rs/clear-commit-marks-in-repo'Junio C Hamano
2020-10-31object: allow clear_commit_marks_all to handle any repoRené Scharfe
2020-10-27Merge branch 'dl/checkout-guess'Junio C Hamano
2020-10-27Merge branch 'dl/checkout-p-merge-base'Junio C Hamano
2020-10-08checkout: learn to respect checkout.guessDenton Liu
2020-10-07builtin/checkout: fix `git checkout -p HEAD...` bugDenton Liu
2020-09-09Merge branch 'jt/interpret-branch-name-fallback'Junio C Hamano
2020-09-02wt-status: tolerate dangling marksJonathan Tan
2020-08-31Merge branch 'rs/checkout-no-overlay-pathspec-fix'Junio C Hamano
2020-08-27Merge branch 'jk/leakfix'Junio C Hamano
2020-08-22checkout, restore: make pathspec recursiveRené Scharfe
2020-08-14checkout: fix leak of non-existent branch namesJeff King