From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: nd/switch-and-restore, was Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)
Date: Wed, 10 Apr 2019 23:51:43 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1904102348500.41@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqr2ab2gs6.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 10 Apr 2019, Junio C Hamano wrote:
> * nd/switch-and-restore (2019-04-02) 39 commits
> - doc: promote "git restore"
> - completion: support restore
> - SQUASH??? move -p test to 2071 from 2070
> - t: add tests for restore
> - restore: support --patch
> - restore: default to --source=HEAD when only --index is specified
> - restore: add --worktree and --index
> - checkout: factor out worktree checkout code
> - restore: disable overlay mode by default
> - restore: make pathspec mandatory
> - restore: take tree-ish from --source option instead
> - checkout: split part of it to new command 'restore'
> - doc: promote "git switch"
> - completion: support switch
> - t: add tests for switch
> - switch: make --orphan switch to an empty tree
> - switch: reject if some operation is in progress
> - switch: no worktree status unless real branch switch happens
> - switch: implicit dwim, use --no-guess to disable it
> - switch: add short option for --detach
> - switch: only allow explicit detached HEAD
> - switch: reject "do nothing" case
> - switch: stop accepting pathspec
> - switch: remove -l
> - switch: add --discard-changes
> - switch: better names for -b and -B
> - checkout: split part of it to new command 'switch'
> - checkout: split options[] array in three pieces
> - checkout: move 'confict_style' and 'dwim_..' to checkout_opts
> - checkout: make "opts" in cmd_checkout() a pointer
> - checkout: factor out some code in parse_branchname_arg()
> - checkout: keep most #include sorted
> - checkout: inform the user when removing branch state
> - checkout: advice how to get out of detached HEAD mode
> - t: rename t2014-switch.sh to t2014-checkout-switch.sh
> - git-checkout.txt: fix monospace typeset
> - doc: document --overwrite-ignore
> - git-checkout.txt: fix one syntax line
> - git-checkout.txt: spell out --no-option
>
> Two new commands "git switch" and "git restore" are introduced to
> split "checking out a branch to work on advancing its history" and
> "checking out paths out of the index and/or a tree-ish to work on
> advancing the current history" out of the single "git checkout"
> command.
>
> cf. <20190329103919.15642-1-pclouds@gmail.com> (switch v6)
> cf. <20190308101655.9767-1-pclouds@gmail.com> (restore v1)
This one fails the CI for almost a month already, still needing this
squashed in:
-- snipsnap --
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index a667a5ced4ec..1faeee50593e 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -144,7 +144,7 @@ $ git restore .
------------
or to restore all working tree files with 'top' pathspec magic (see
-linkgit::gitglossary[7])
+linkgit:gitglossary[7])
------------
$ git restore :/
next prev parent reply other threads:[~2019-04-10 21:51 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-09 18:08 What's cooking in git.git (Apr 2019, #02; Wed, 10) Junio C Hamano
2019-04-09 18:22 ` Denton Liu
2019-04-10 3:09 ` Junio C Hamano
2019-04-09 19:18 ` Thomas Gummerer
2019-04-10 3:01 ` Junio C Hamano
2019-04-10 20:45 ` Thomas Gummerer
2019-04-10 22:13 ` Johannes Schindelin
2019-04-10 0:46 ` Todd Zullinger
2019-04-10 10:12 ` Phillip Wood
2019-04-10 22:15 ` Johannes Schindelin
2019-04-10 18:29 ` Mazo, Andrey
2019-04-10 21:51 ` Johannes Schindelin [this message]
2019-04-10 21:56 ` dl/warn-tagging-a-tag, was " Johannes Schindelin
2019-04-12 1:51 ` Junio C Hamano
2019-04-10 22:32 ` jh/trace2-sid-fix, " Johannes Schindelin
2019-04-11 15:06 ` Christian Couder
2019-04-14 3:55 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1904102348500.41@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).