summaryrefslogtreecommitdiffstats
path: root/builtin/checkout.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * merge-recursive: remove useless parameter in merge_trees()Elijah Newren2019-08-191-3/+1
| * checkout: provide better conflict hunk description with detached HEADElijah Newren2019-08-161-0/+8
* | Merge branch 'nd/switch-and-restore'Junio C Hamano2019-09-301-0/+9
|\ \
| * | checkout: add simple check for 'git checkout -b'Derrick Stolee2019-08-301-0/+9
* | | Merge branch 'en/checkout-mismerge-fix'Junio C Hamano2019-09-091-7/+0
|\ \ \
| * | | checkout: remove duplicate codeElijah Newren2019-08-161-7/+0
* | | | Merge branch 'vn/restore-empty-ita-corner-case-fix'Junio C Hamano2019-08-221-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | checkout.c: unstage empty deleted ita filesVarun Naik2019-08-021-0/+1
* | | | l10n: reformat some localized strings for v2.23.0Jean-Noël Avila2019-08-061-1/+1
|/ / /
* | | Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-101-320/+584
|\ \ \ | |/ / |/| / | |/
| * switch: allow to switch in the middle of bisectNguyễn Thái Ngọc Duy2019-06-201-3/+1
| * restore: support --patchNguyễn Thái Ngọc Duy2019-05-071-2/+4
| * restore: replace --force with --ignore-unmergedNguyễn Thái Ngọc Duy2019-05-071-9/+20
| * restore: default to --source=HEAD when only --staged is specifiedNguyễn Thái Ngọc Duy2019-05-071-0/+6
| * restore: reject invalid combinations with --stagedNguyễn Thái Ngọc Duy2019-05-071-0/+10
| * restore: add --worktree and --stagedNguyễn Thái Ngọc Duy2019-05-071-6/+68
| * checkout: factor out worktree checkout codeNguyễn Thái Ngọc Duy2019-05-071-49/+59
| * restore: disable overlay mode by defaultNguyễn Thái Ngọc Duy2019-05-071-4/+7
| * restore: make pathspec mandatoryNguyễn Thái Ngọc Duy2019-05-071-0/+7
| * restore: take tree-ish from --source option insteadNguyễn Thái Ngọc Duy2019-05-071-8/+34
| * checkout: split part of it to new command 'restore'Nguyễn Thái Ngọc Duy2019-05-071-0/+26
| * switch: make --orphan switch to an empty treeNguyễn Thái Ngọc Duy2019-04-021-8/+31
| * switch: reject if some operation is in progressNguyễn Thái Ngọc Duy2019-04-021-0/+40
| * switch: no worktree status unless real branch switch happensNguyễn Thái Ngọc Duy2019-04-021-126/+8
| * switch: implicit dwim, use --no-guess to disable itNguyễn Thái Ngọc Duy2019-04-021-8/+8
| * switch: add short option for --detachNguyễn Thái Ngọc Duy2019-04-021-1/+1
| * switch: only allow explicit detached HEADNguyễn Thái Ngọc Duy2019-04-021-0/+34
| * switch: reject "do nothing" caseNguyễn Thái Ngọc Duy2019-04-021-0/+9
| * switch: stop accepting pathspecNguyễn Thái Ngọc Duy2019-04-021-5/+15
| * switch: remove -lNguyễn Thái Ngọc Duy2019-04-021-1/+1
| * switch: add --discard-changesNguyễn Thái Ngọc Duy2019-04-021-2/+10
| * switch: better names for -b and -BNguyễn Thái Ngọc Duy2019-04-021-11/+21
| * checkout: split part of it to new command 'switch'Nguyễn Thái Ngọc Duy2019-04-021-12/+48
| * checkout: split options[] array in three piecesNguyễn Thái Ngọc Duy2019-04-021-23/+59
| * checkout: move 'confict_style' and 'dwim_..' to checkout_optsNguyễn Thái Ngọc Duy2019-04-021-7/+10
| * checkout: make "opts" in cmd_checkout() a pointerNguyễn Thái Ngọc Duy2019-04-021-57/+58
| * checkout: factor out some code in parse_branchname_arg()Nguyễn Thái Ngọc Duy2019-04-021-20/+31
| * checkout: keep most #include sortedNguyễn Thái Ngọc Duy2019-04-021-17/+17
| * checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy2019-04-021-1/+1
* | Merge branch 'nd/checkout-m'Junio C Hamano2019-04-251-2/+9
|\ \
| * | checkout: prevent losing staged changes with --mergeNguyễn Thái Ngọc Duy2019-03-241-1/+10
| * | unpack-trees: rename "gently" flag to "quiet"Nguyễn Thái Ngọc Duy2019-03-241-1/+1
| |/
* | Merge branch 'jk/unused-params-even-more'Junio C Hamano2019-04-251-1/+1
|\ \
| * | report_path_error(): drop unused prefix parameterJeff King2019-03-201-1/+1
| |/
* | Merge branch 'nd/checkout-m-doc-update'Junio C Hamano2019-04-161-0/+9
|\ \ | |/ |/|
| * checkout.txt: note about losing staged changes with --mergeNguyễn Thái Ngọc Duy2019-03-211-0/+9
* | Merge branch 'jh/trace2'Junio C Hamano2019-03-071-0/+7
|\ \
| * | trace2:data: add subverb to checkout commandJeff Hostetler2019-02-231-0/+7
| |/
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 09:33:13 +0100