From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Subject: [PATCH] Revert "Declare both git-switch and git-restore experimental"
Date: Tue, 20 Feb 2024 10:29:51 +0100 [thread overview]
Message-ID: <20240220092957.1296283-2-matttbe@kernel.org> (raw)
This reverts commit 4e43b7ff1ea4b6f16b93a432b6718e9ab38749bd.
Recently, I wanted to recommend the use of git-switch and git-restore
instead of git-checkout in new documentation pages. But then, I found
out that these two commands were still marked as experimental in the
documentation. git-switch and git-restore have been marked as such since
their introduction, in version 2.23.
That was for good reasons, according to the reverted commit:
> These two commands are basically redesigned git-checkout. We will not
> have that many opportunities to redo (because we run out of verbs, and
> that would also increase maintenance cost).
The reverted commit also mentions this:
> To play it safe, let's declare the two commands experimental in one or
> two releases. If there is a serious flaw in the UI, we could still fix
> it. If everything goes well and nobody complains loudly, we can remove
> the experimental status by reverting this patch.
Version 2.44 is approaching, almost 5 years after the introduction of
these two commands, it then looks safe to remove this experimental
status.
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Notes:
Here is a simple 'git revert', as suggested in 4e43b7ff1e ("Declare both
git-switch and git-restore experimental"), without any conflicts to
resolve.
BTW, thank you very much for maintaining and still improving this great
tool!
Documentation/git-restore.txt | 2 --
Documentation/git-switch.txt | 2 --
2 files changed, 4 deletions(-)
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index 975825b44a..4f5531c440 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -28,8 +28,6 @@ otherwise from the index. Use `--source` to restore from a different commit.
See "Reset, restore and revert" in linkgit:git[1] for the differences
between the three commands.
-THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
-
OPTIONS
-------
-s <tree>::
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt
index f38e4c8afa..96cfd9ba52 100644
--- a/Documentation/git-switch.txt
+++ b/Documentation/git-switch.txt
@@ -29,8 +29,6 @@ Switching branches does not require a clean index and working tree
however if the operation leads to loss of local changes, unless told
otherwise with `--discard-changes` or `--merge`.
-THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
-
OPTIONS
-------
<branch>::
--
2.43.0
next reply other threads:[~2024-02-20 9:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-20 9:29 Matthieu Baerts (NGI0) [this message]
2024-02-20 9:36 ` [PATCH] Revert "Declare both git-switch and git-restore experimental" Kristoffer Haugsbakk
2024-02-20 9:58 ` Matthieu Baerts
2024-02-20 11:36 ` Kristoffer Haugsbakk
2024-02-20 18:04 ` Junio C Hamano
2024-02-20 18:39 ` Matthieu Baerts
2024-02-20 19:57 ` Martin
2024-02-20 13:34 ` Martin
[not found] ` <dfaed16c-5e24-4dfb-8afd-b703134e5ada@mfriebe.de>
2024-02-20 16:20 ` Kristoffer Haugsbakk
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240220092957.1296283-2-matttbe@kernel.org \
--to=matttbe@kernel.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.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.
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 NNTP newsgroup(s).