summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)Author
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
2019-05-07restore: add --worktree and --stagedNguyễn Thái Ngọc Duy
2019-05-07checkout: factor out worktree checkout codeNguyễn Thái Ngọc Duy
2019-05-07restore: disable overlay mode by defaultNguyễn Thái Ngọc Duy
2019-05-07restore: make pathspec mandatoryNguyễn Thái Ngọc Duy
2019-05-07restore: take tree-ish from --source option insteadNguyễn Thái Ngọc Duy
2019-05-07checkout: split part of it to new command 'restore'Nguyễn Thái Ngọc Duy
2019-04-25Merge branch 'nd/checkout-m'Junio C Hamano
2019-04-25Merge branch 'jk/unused-params-even-more'Junio C Hamano
2019-04-16Merge branch 'nd/checkout-m-doc-update'Junio C Hamano
2019-04-02switch: make --orphan switch to an empty treeNguyễn Thái Ngọc Duy
2019-04-02switch: reject if some operation is in progressNguyễn Thái Ngọc Duy
2019-04-02switch: no worktree status unless real branch switch happensNguyễn Thái Ngọc Duy
2019-04-02switch: implicit dwim, use --no-guess to disable itNguyễn Thái Ngọc Duy
2019-04-02switch: add short option for --detachNguyễn Thái Ngọc Duy
2019-04-02switch: only allow explicit detached HEADNguyễn Thái Ngọc Duy
2019-04-02switch: reject "do nothing" caseNguyễn Thái Ngọc Duy
2019-04-02switch: stop accepting pathspecNguyễn Thái Ngọc Duy
2019-04-02switch: remove -lNguyễn Thái Ngọc Duy
2019-04-02switch: add --discard-changesNguyễn Thái Ngọc Duy
2019-04-02switch: better names for -b and -BNguyễn Thái Ngọc Duy
2019-04-02checkout: split part of it to new command 'switch'Nguyễn Thái Ngọc Duy
2019-04-02checkout: split options[] array in three piecesNguyễn Thái Ngọc Duy
2019-04-02checkout: move 'confict_style' and 'dwim_..' to checkout_optsNguyễn Thái Ngọc Duy
2019-04-02checkout: make "opts" in cmd_checkout() a pointerNguyễn Thái Ngọc Duy
2019-04-02checkout: factor out some code in parse_branchname_arg()Nguyễn Thái Ngọc Duy
2019-04-02checkout: keep most #include sortedNguyễn Thái Ngọc Duy
2019-04-02checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy
2019-03-24checkout: prevent losing staged changes with --mergeNguyễn Thái Ngọc Duy
2019-03-24unpack-trees: rename "gently" flag to "quiet"Nguyễn Thái Ngọc Duy
2019-03-21checkout.txt: note about losing staged changes with --mergeNguyễn Thái Ngọc Duy
2019-03-20report_path_error(): drop unused prefix parameterJeff King
2019-03-07Merge branch 'jh/trace2'Junio C Hamano
2019-03-07Merge branch 'tg/checkout-no-overlay'Junio C Hamano