diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-17 10:44:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-17 10:44:55 -0700 |
| commit | 4d9f744e34e079310f4e9bb64d13c423906ee62e (patch) | |
| tree | 92999beff447106102939b4afed5cce4eb6103d2 /mergetools | |
| parent | Sync with 2.4.6 (diff) | |
| parent | Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference (diff) | |
| download | tgif-4d9f744e34e079310f4e9bb64d13c423906ee62e.tar.xz | |
Merge branch 'es/worktree-add'
Update to the "linked checkout" in 2.5.0-rc1.
Instead of "checkout --to" that does not do what "checkout"
normally does, move the functionality to "git worktree add".
As this makes the end-user experience of the "worktree add" more or
less complete, I am tempted to say we should cook the other topic
that removes the internal "new-worktree-mode" hack from "checkout"
a bit longer in 'next', and release 2.5 final without that one.
* es/worktree-add:
Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference
worktree: caution that this is still experimental
Documentation/git-worktree: fix stale "git checkout --to" references
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions