summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
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
2020-06-08Merge branch 'bc/filter-process'Libravatar Junio C Hamano1-3/+1
2020-05-24checkout: improve error messages for -b with extra argumentLibravatar René Scharfe1-1/+1
2020-05-21builtin/checkout: simplify metadata initializationLibravatar brian m. carlson1-3/+1
2020-05-08Merge branch 'es/restore-staged-from-head-by-default'Libravatar Junio C Hamano1-3/+3
2020-05-08Merge branch 'dl/switch-c-option-in-error-message'Libravatar Junio C Hamano1-4/+10
2020-05-05restore: default to HEAD when combining --staged and --worktreeLibravatar Eric Sunshine1-3/+3
2020-04-30switch: fix errors and comments related to -c and -CLibravatar Denton Liu1-4/+10
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FLibravatar Denton Liu1-2/+2
2020-03-16builtin/checkout: compute checkout metadata for checkoutsLibravatar brian m. carlson1-4/+14
2020-03-16convert: provide additional metadata to filtersLibravatar brian m. carlson1-0/+13
2020-03-12builtin/checkout: pass branch info down to checkout_worktreeLibravatar brian m. carlson1-16/+17
2020-02-17Merge branch 'rs/strbuf-insertstr'Libravatar Junio C Hamano1-1/+1
2020-02-10strbuf: add and use strbuf_insertstr()Libravatar René Scharfe1-1/+1
2020-02-05Merge branch 'am/checkout-file-and-ref-ref-ambiguity'Libravatar Junio C Hamano1-32/+39
2020-01-22Merge branch 'nd/switch-and-restore'Libravatar Junio C Hamano1-0/+2
2020-01-08restore: invalidate cache-tree when removing entries with --stagedLibravatar Jeff King1-0/+2
2020-01-07checkout: don't revert file on ambiguous tracking branchesLibravatar Alexandr Miloslavskiy1-31/+25
2020-01-07parse_branchname_arg(): extract part as new functionLibravatar Alexandr Miloslavskiy1-6/+19
2019-12-04checkout, restore: support the --pathspec-from-file optionLibravatar Alexandr Miloslavskiy1-4/+27
2019-10-15Merge branch 'en/merge-recursive-cleanup'Libravatar Junio C Hamano1-4/+10
2019-09-30Merge branch 'nd/switch-and-restore'Libravatar Junio C Hamano1-0/+9
2019-09-09Merge branch 'en/checkout-mismerge-fix'Libravatar Junio C Hamano1-7/+0
2019-08-30checkout: add simple check for 'git checkout -b'Libravatar Derrick Stolee1-0/+9
2019-08-22Merge branch 'vn/restore-empty-ita-corner-case-fix'Libravatar Junio C Hamano1-0/+1
2019-08-19cache-tree: share code between functions writing an index as a treeLibravatar Elijah Newren1-1/+1
2019-08-19merge-recursive: remove useless parameter in merge_trees()Libravatar Elijah Newren1-3/+1
2019-08-16checkout: provide better conflict hunk description with detached HEADLibravatar Elijah Newren1-0/+8
2019-08-16checkout: remove duplicate codeLibravatar Elijah Newren1-7/+0
2019-08-06l10n: reformat some localized strings for v2.23.0Libravatar Jean-Noël Avila1-1/+1
2019-08-02checkout.c: unstage empty deleted ita filesLibravatar Varun Naik1-0/+1
2019-07-09Merge branch 'nd/switch-and-restore'Libravatar Junio C Hamano1-320/+584
2019-06-20switch: allow to switch in the middle of bisectLibravatar Nguyễn Thái Ngọc Duy1-3/+1
2019-05-07restore: support --patchLibravatar Nguyễn Thái Ngọc Duy1-2/+4
2019-05-07restore: replace --force with --ignore-unmergedLibravatar Nguyễn Thái Ngọc Duy1-9/+20
2019-05-07restore: default to --source=HEAD when only --staged is specifiedLibravatar Nguyễn Thái Ngọc Duy1-0/+6
2019-05-07restore: reject invalid combinations with --stagedLibravatar Nguyễn Thái Ngọc Duy1-0/+10
2019-05-07restore: add --worktree and --stagedLibravatar Nguyễn Thái Ngọc Duy1-6/+68
2019-05-07checkout: factor out worktree checkout codeLibravatar Nguyễn Thái Ngọc Duy1-49/+59
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 05:25:55 +0000