Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: promote "git restore" | Nguyễn Thái Ngọc Duy | 2019-05-07 | 16 | -84/+93 |
* | user-manual.txt: prefer 'merge --abort' over 'reset --hard' | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -1/+1 |
* | completion: support restore | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -0/+15 |
* | t: add tests for restore | Nguyễn Thái Ngọc Duy | 2019-05-07 | 3 | -0/+221 |
* | restore: support --patch | Nguyễn Thái Ngọc Duy | 2019-05-07 | 2 | -2/+56 |
* | restore: replace --force with --ignore-unmerged | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -9/+20 |
* | restore: default to --source=HEAD when only --staged is specified | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -0/+6 |
* | restore: reject invalid combinations with --staged | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -0/+10 |
* | restore: add --worktree and --staged | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -6/+68 |
* | checkout: factor out worktree checkout code | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -49/+59 |
* | restore: disable overlay mode by default | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -4/+7 |
* | restore: make pathspec mandatory | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -0/+7 |
* | restore: take tree-ish from --source option instead | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -8/+34 |
* | checkout: split part of it to new command 'restore' | Nguyễn Thái Ngọc Duy | 2019-05-07 | 13 | -5/+257 |
* | doc: promote "git switch" | Nguyễn Thái Ngọc Duy | 2019-04-02 | 19 | -105/+105 |
* | completion: support switch | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -1/+36 |
* | t: add tests for switch | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -0/+96 |
* | switch: make --orphan switch to an empty tree | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -8/+31 |
* | switch: reject if some operation is in progress | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -0/+40 |
* | switch: no worktree status unless real branch switch happens | Nguyễn Thái Ngọc Duy | 2019-04-02 | 3 | -148/+8 |
* | switch: implicit dwim, use --no-guess to disable it | Nguyễn Thái Ngọc Duy | 2019-04-02 | 2 | -23/+31 |
* | switch: add short option for --detach | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -1/+1 |
* | switch: only allow explicit detached HEAD | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -0/+34 |
* | switch: reject "do nothing" case | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -0/+9 |
* | switch: stop accepting pathspec | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -5/+15 |
* | switch: remove -l | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -1/+1 |
* | switch: add --discard-changes | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -2/+10 |
* | switch: better names for -b and -B | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -11/+21 |
* | checkout: split part of it to new command 'switch' | Nguyễn Thái Ngọc Duy | 2019-04-02 | 14 | -27/+353 |
* | checkout: split options[] array in three pieces | Nguyễn Thái Ngọc Duy | 2019-04-02 | 3 | -23/+77 |
* | checkout: move 'confict_style' and 'dwim_..' to checkout_opts | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -7/+10 |
* | checkout: make "opts" in cmd_checkout() a pointer | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -57/+58 |
* | checkout: factor out some code in parse_branchname_arg() | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -20/+31 |
* | checkout: keep most #include sorted | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -17/+17 |
* | checkout: inform the user when removing branch state | Nguyễn Thái Ngọc Duy | 2019-04-02 | 7 | -11/+14 |
* | checkout: advice how to get out of detached HEAD mode | Nguyễn Thái Ngọc Duy | 2019-04-02 | 2 | -4/+25 |
* | t: rename t2014-switch.sh to t2014-checkout-switch.sh | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -0/+0 |
* | git-checkout.txt: fix monospace typeset | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -81/+81 |
* | doc: document --overwrite-ignore | Nguyễn Thái Ngọc Duy | 2019-04-02 | 2 | -0/+11 |
* | git-checkout.txt: fix one syntax line | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -1/+1 |
* | git-checkout.txt: spell out --no-option | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -4/+7 |
* | The second batch | Junio C Hamano | 2019-03-11 | 1 | -0/+22 |
* | Sync with maint | Junio C Hamano | 2019-03-11 | 1 | -1/+1 |
|\ | |||||
| * | mingw: allow building with an MSYS2 runtime v3.x | Johannes Schindelin | 2019-03-11 | 1 | -1/+1 |
* | | Merge branch 'js/rebase-recreate-merge' | Junio C Hamano | 2019-03-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | rebase docs: fix "gitlink" typo | Kyle Meyer | 2019-03-01 | 1 | -1/+1 |
* | | | Merge branch 'js/untravis-windows' | Junio C Hamano | 2019-03-11 | 2 | -113/+0 |
|\ \ \ | |||||
| * | | | travis: remove the hack to build the Windows job on Azure Pipelines | Johannes Schindelin | 2019-03-01 | 2 | -113/+0 |
* | | | | Merge branch 'rd/gc-prune-doc-fix' | Junio C Hamano | 2019-03-11 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | docs/git-gc: fix typo "--prune=all" to "--prune=now" | Robert P. J. Day | 2019-03-03 | 1 | -1/+1 |