summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mt/parallel-checkout-part-3'Junio C Hamano2021-05-161-4/+18
|\
| * builtin/checkout.c: complete parallel checkout supportMatheus Tavares2021-05-051-4/+17
| * make_transient_cache_entry(): optionally alloc from mem_poolMatheus Tavares2021-05-051-1/+1
* | Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano2021-05-101-3/+3
|\ \
| * | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-3/+3
| |/
* | Merge branch 'ah/plugleaks'Junio C Hamano2021-05-071-0/+1
|\ \
| * | builtin/checkout: clear pending objects after diffingAndrzej Hunt2021-04-281-0/+1
* | | Merge branch 'ds/sparse-index-protections'Junio C Hamano2021-04-301-0/+5
|\ \ \ | |_|/ |/| |
| * | checkout: ensure full indexDerrick Stolee2021-04-141-0/+5
* | | Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano2021-04-021-0/+1
|\ \ \ | |/ / |/| |
| * | entry: extract a header file for entry.c functionsMatheus Tavares2021-03-231-0/+1
| |/
* | tree.h API: simplify read_tree_recursive() signatureÆvar Arnfjörð Bjarmason2021-03-201-4/+4
|/
* cache-tree: clean up cache_tree_update()Derrick Stolee2021-01-231-3/+0
* Merge branch 'dl/checkout-p-merge-base'Junio C Hamano2020-12-231-2/+4
|\
| * checkout -p: handle tree arguments correctly againJohannes Schindelin2020-12-211-2/+4
* | Merge branch 'rs/clear-commit-marks-in-repo'Junio C Hamano2020-11-111-1/+1
|\ \
| * | object: allow clear_commit_marks_all to handle any repoRené Scharfe2020-10-311-1/+1
* | | Merge branch 'dl/checkout-guess'Junio C Hamano2020-10-271-1/+6
|\ \ \
| * | | checkout: learn to respect checkout.guessDenton Liu2020-10-081-1/+6
| |/ /
* | | Merge branch 'dl/checkout-p-merge-base'Junio C Hamano2020-10-271-1/+14
|\ \ \ | |/ / |/| / | |/
| * builtin/checkout: fix `git checkout -p HEAD...` bugDenton Liu2020-10-071-1/+14
* | Merge branch 'jt/interpret-branch-name-fallback'Junio C Hamano2020-09-091-2/+2
|\ \
| * | wt-status: tolerate dangling marksJonathan Tan2020-09-021-2/+2
| |/
* | Merge branch 'rs/checkout-no-overlay-pathspec-fix'Junio C Hamano2020-08-311-0/+2
|\ \
| * | checkout, restore: make pathspec recursiveRené Scharfe2020-08-221-0/+2
* | | Merge branch 'jk/leakfix'Junio C Hamano2020-08-271-1/+3
|\ \ \
| * | | checkout: fix leak of non-existent branch namesJeff King2020-08-141-1/+3
| | |/ | |/|
* | | checkout: support renormalization with checkout -m <paths>Elijah Newren2020-08-031-5/+6
* | | merge: make merge.renormalize work for all uses of merge machineryElijah Newren2020-08-031-7/+0
|/ /
* | Merge branch 'bc/filter-process'Junio C Hamano2020-06-081-3/+1
|\ \
| * | builtin/checkout: simplify metadata initializationbrian m. carlson2020-05-211-3/+1
* | | checkout: improve error messages for -b with extra argumentRené Scharfe2020-05-241-1/+1
* | | Merge branch 'es/restore-staged-from-head-by-default'Junio C Hamano2020-05-081-3/+3
|\ \ \
| * | | restore: default to HEAD when combining --staged and --worktreeEric Sunshine2020-05-051-3/+3
* | | | Merge branch 'dl/switch-c-option-in-error-message'Junio C Hamano2020-05-081-4/+10
|\ \ \ \
| * | | | switch: fix errors and comments related to -c and -CDenton Liu2020-04-301-4/+10
* | | | | Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu2020-04-281-2/+2
| |_|/ / |/| | |
* | | | builtin/checkout: compute checkout metadata for checkoutsbrian m. carlson2020-03-161-4/+14
* | | | convert: provide additional metadata to filtersbrian m. carlson2020-03-161-0/+13
* | | | builtin/checkout: pass branch info down to checkout_worktreebrian m. carlson2020-03-121-16/+17
| |/ / |/| |
* | | Merge branch 'rs/strbuf-insertstr'Junio C Hamano2020-02-171-1/+1
|\ \ \
| * | | strbuf: add and use strbuf_insertstr()René Scharfe2020-02-101-1/+1
| | |/ | |/|
* | | Merge branch 'am/checkout-file-and-ref-ref-ambiguity'Junio C Hamano2020-02-051-32/+39
|\ \ \
| * | | checkout: don't revert file on ambiguous tracking branchesAlexandr Miloslavskiy2020-01-071-31/+25
| * | | parse_branchname_arg(): extract part as new functionAlexandr Miloslavskiy2020-01-071-6/+19
| | |/ | |/|
* | | Merge branch 'nd/switch-and-restore'Junio C Hamano2020-01-221-0/+2
|\ \ \ | |_|/ |/| |
| * | restore: invalidate cache-tree when removing entries with --stagedJeff King2020-01-081-0/+2
* | | checkout, restore: support the --pathspec-from-file optionAlexandr Miloslavskiy2019-12-041-4/+27
| |/ |/|
* | Merge branch 'en/merge-recursive-cleanup'Junio C Hamano2019-10-151-4/+10
|\ \
| * | cache-tree: share code between functions writing an index as a treeElijah Newren2019-08-191-1/+1
View Lorry Controller Status