summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-1065-661/+1917
|\
| * completion: disable dwim on "git switch -d"Nguyễn Thái Ngọc Duy2019-06-201-0/+4
| * switch: allow to switch in the middle of bisectNguyễn Thái Ngọc Duy2019-06-201-3/+1
| * t2027: use test_must_be_emptyNguyễn Thái Ngọc Duy2019-06-201-3/+2
| * Declare both git-switch and git-restore experimentalNguyễn Thái Ngọc Duy2019-05-072-0/+4
| * help: move git-diff and git-reset to different groupsNguyễn Thái Ngọc Duy2019-05-071-2/+2
| * doc: promote "git restore"Nguyễn Thái Ngọc Duy2019-05-0716-84/+93
| * user-manual.txt: prefer 'merge --abort' over 'reset --hard'Nguyễn Thái Ngọc Duy2019-05-071-1/+1
| * completion: support restoreNguyễn Thái Ngọc Duy2019-05-071-0/+15
| * t: add tests for restoreNguyễn Thái Ngọc Duy2019-05-073-0/+221
| * restore: support --patchNguyễn Thái Ngọc Duy2019-05-072-2/+56
| * 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-0713-5/+257
| * doc: promote "git switch"Nguyễn Thái Ngọc Duy2019-04-0219-105/+105
| * completion: support switchNguyễn Thái Ngọc Duy2019-04-021-1/+36
| * t: add tests for switchNguyễn Thái Ngọc Duy2019-04-021-0/+96
| * 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-023-148/+8
| * switch: implicit dwim, use --no-guess to disable itNguyễn Thái Ngọc Duy2019-04-022-23/+31
| * 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-0214-27/+353
| * checkout: split options[] array in three piecesNguyễn Thái Ngọc Duy2019-04-023-23/+77
| * 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-027-11/+14
| * checkout: advice how to get out of detached HEAD modeNguyễn Thái Ngọc Duy2019-04-022-4/+25
| * t: rename t2014-switch.sh to t2014-checkout-switch.shNguyễn Thái Ngọc Duy2019-04-021-0/+0
| * git-checkout.txt: fix monospace typesetNguyễn Thái Ngọc Duy2019-04-021-81/+81
| * doc: document --overwrite-ignoreNguyễn Thái Ngọc Duy2019-04-022-0/+11
| * git-checkout.txt: fix one syntax lineNguyễn Thái Ngọc Duy2019-04-021-1/+1
| * git-checkout.txt: spell out --no-optionNguyễn Thái Ngọc Duy2019-04-021-4/+7
* | Merge branch 'nd/fetch-capability-tweak'Junio C Hamano2019-07-101-24/+37
|\ \
| * | fetch-pack: print server version at the top in -v -vNguyễn Thái Ngọc Duy2019-06-201-6/+7
| * | fetch-pack: print all relevant supported capabilities with -v -vNguyễn Thái Ngọc Duy2019-06-201-9/+21
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 08:23:08 +0100