summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)Author
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
2020-08-03checkout: support renormalization with checkout -m <paths>Elijah Newren
2020-08-03merge: make merge.renormalize work for all uses of merge machineryElijah Newren
2020-06-09Merge branch 'bc/filter-process'Junio C Hamano
2020-05-24checkout: improve error messages for -b with extra argumentRené Scharfe
2020-05-21builtin/checkout: simplify metadata initializationbrian m. carlson
2020-05-08Merge branch 'es/restore-staged-from-head-by-default'Junio C Hamano
2020-05-08Merge branch 'dl/switch-c-option-in-error-message'Junio C Hamano
2020-05-05restore: default to HEAD when combining --staged and --worktreeEric Sunshine
2020-04-30switch: fix errors and comments related to -c and -CDenton Liu
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu
2020-03-16builtin/checkout: compute checkout metadata for checkoutsbrian m. carlson
2020-03-16convert: provide additional metadata to filtersbrian m. carlson
2020-03-12builtin/checkout: pass branch info down to checkout_worktreebrian m. carlson
2020-02-17Merge branch 'rs/strbuf-insertstr'Junio C Hamano
2020-02-10strbuf: add and use strbuf_insertstr()René Scharfe
2020-02-05Merge branch 'am/checkout-file-and-ref-ref-ambiguity'Junio C Hamano
2020-01-22Merge branch 'nd/switch-and-restore'Junio C Hamano
2020-01-08restore: invalidate cache-tree when removing entries with --stagedJeff King
2020-01-07checkout: don't revert file on ambiguous tracking branchesAlexandr Miloslavskiy
2020-01-07parse_branchname_arg(): extract part as new functionAlexandr Miloslavskiy
2019-12-04checkout, restore: support the --pathspec-from-file optionAlexandr Miloslavskiy
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano
2019-09-30Merge branch 'nd/switch-and-restore'Junio C Hamano
2019-09-09Merge branch 'en/checkout-mismerge-fix'Junio C Hamano
2019-08-30checkout: add simple check for 'git checkout -b'Derrick Stolee
2019-08-22Merge branch 'vn/restore-empty-ita-corner-case-fix'Junio C Hamano
2019-08-19cache-tree: share code between functions writing an index as a treeElijah Newren
2019-08-19merge-recursive: remove useless parameter in merge_trees()Elijah Newren
2019-08-16checkout: provide better conflict hunk description with detached HEADElijah Newren
2019-08-16checkout: remove duplicate codeElijah Newren
2019-08-06l10n: reformat some localized strings for v2.23.0Jean-Noël Avila
2019-08-02checkout.c: unstage empty deleted ita filesVarun Naik
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano
2019-06-20switch: allow to switch in the middle of bisectNguyễn Thái Ngọc Duy
2019-05-07restore: support --patchNguyễn Thái Ngọc Duy
2019-05-07restore: replace --force with --ignore-unmergedNguyễn Thái Ngọc Duy
2019-05-07restore: default to --source=HEAD when only --staged is specifiedNguyễn Thái Ngọc Duy
2019-05-07restore: reject invalid combinations with --stagedNguyễn Thái Ngọc Duy