summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
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
2019-05-07restore: disable overlay mode by defaultLibravatar Nguyễn Thái Ngọc Duy1-4/+7
2019-05-07restore: make pathspec mandatoryLibravatar Nguyễn Thái Ngọc Duy1-0/+7
2019-05-07restore: take tree-ish from --source option insteadLibravatar Nguyễn Thái Ngọc Duy1-8/+34
2019-05-07checkout: split part of it to new command 'restore'Libravatar Nguyễn Thái Ngọc Duy1-0/+26
2019-04-25Merge branch 'nd/checkout-m'Libravatar Junio C Hamano1-2/+9
2019-04-25Merge branch 'jk/unused-params-even-more'Libravatar Junio C Hamano1-1/+1
2019-04-16Merge branch 'nd/checkout-m-doc-update'Libravatar Junio C Hamano1-0/+9
2019-04-02switch: make --orphan switch to an empty treeLibravatar Nguyễn Thái Ngọc Duy1-8/+31
2019-04-02switch: reject if some operation is in progressLibravatar Nguyễn Thái Ngọc Duy1-0/+40
2019-04-02switch: no worktree status unless real branch switch happensLibravatar Nguyễn Thái Ngọc Duy1-126/+8
2019-04-02switch: implicit dwim, use --no-guess to disable itLibravatar Nguyễn Thái Ngọc Duy1-8/+8
2019-04-02switch: add short option for --detachLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-04-02switch: only allow explicit detached HEADLibravatar Nguyễn Thái Ngọc Duy1-0/+34
2019-04-02switch: reject "do nothing" caseLibravatar Nguyễn Thái Ngọc Duy1-0/+9
2019-04-02switch: stop accepting pathspecLibravatar Nguyễn Thái Ngọc Duy1-5/+15
2019-04-02switch: remove -lLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-04-02switch: add --discard-changesLibravatar Nguyễn Thái Ngọc Duy1-2/+10
2019-04-02switch: better names for -b and -BLibravatar Nguyễn Thái Ngọc Duy1-11/+21
2019-04-02checkout: split part of it to new command 'switch'Libravatar Nguyễn Thái Ngọc Duy1-12/+48
2019-04-02checkout: split options[] array in three piecesLibravatar Nguyễn Thái Ngọc Duy1-23/+59
2019-04-02checkout: move 'confict_style' and 'dwim_..' to checkout_optsLibravatar Nguyễn Thái Ngọc Duy1-7/+10
2019-04-02checkout: make "opts" in cmd_checkout() a pointerLibravatar Nguyễn Thái Ngọc Duy1-57/+58
2019-04-02checkout: factor out some code in parse_branchname_arg()Libravatar Nguyễn Thái Ngọc Duy1-20/+31
2019-04-02checkout: keep most #include sortedLibravatar Nguyễn Thái Ngọc Duy1-17/+17
2019-04-02checkout: inform the user when removing branch stateLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-03-24checkout: prevent losing staged changes with --mergeLibravatar Nguyễn Thái Ngọc Duy1-1/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 19:26:34 +0000