All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] branch doc: consistently promote 'switch'
@ 2026-11-03 21:58 Junio C Hamano
  2026-11-04 17:52 ` Ben Knoble
  0 siblings, 1 reply; 2+ messages in thread
From: Junio C Hamano @ 2026-11-03 21:58 UTC (permalink / raw)
  To: git

When 328c6cb853 (doc: promote "git switch", 2019-03-29) updated an
example in git-branch documentation, it made an inconsistent change
to turn "git checkout my2.6.14" command in an example into "git
switch my2.6.14", without updating a comment that talks about a
shorthand to create and checkout the newly created branch at the
same time, which still talked about "checkout -b <new> <start>".

Update the latter to talk about "git switch -c" for consistency.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 * An alternative would be to list both "git checkout -b" and "git
   switch -c", as "git checkout" is not going away (for the purpose
   of *replacing* checkout, the switch/restore were a failed
   experiment, even though they gained enough users to stay).

 Documentation/git-branch.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git c/Documentation/git-branch.adoc w/Documentation/git-branch.adoc
index bfdf459329..a803c24858 100644
--- c/Documentation/git-branch.adoc
+++ w/Documentation/git-branch.adoc
@@ -406,17 +406,17 @@ Start development from a known tag::
 ------------
 $ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
 $ cd my2.6
 $ git branch my2.6.14 v2.6.14   <1>
 $ git switch my2.6.14
 ------------
 +
 <1> This step and the next one could be combined into a single step with
-    "checkout -b my2.6.14 v2.6.14".
+    "git switch -c my2.6.14 v2.6.14".
 
 Delete an unneeded branch::
 +
 ------------
 $ git clone git://git.kernel.org/.../git.git my.git
 $ cd my.git
 $ git branch -d -r origin/todo origin/html origin/man   <1>
 $ git branch -D test                                    <2>

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] branch doc: consistently promote 'switch'
  2026-11-03 21:58 [PATCH] branch doc: consistently promote 'switch' Junio C Hamano
@ 2026-11-04 17:52 ` Ben Knoble
  0 siblings, 0 replies; 2+ messages in thread
From: Ben Knoble @ 2026-11-04 17:52 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git


> Le 3 nov. 2026 à 16:59, Junio C Hamano <gitster@pobox.com> a écrit :
> 
> When 328c6cb853 (doc: promote "git switch", 2019-03-29) updated an
> example in git-branch documentation, it made an inconsistent change
> to turn "git checkout my2.6.14" command in an example into "git
> switch my2.6.14", without updating a comment that talks about a
> shorthand to create and checkout the newly created branch at the
> same time, which still talked about "checkout -b <new> <start>".
> 
> Update the latter to talk about "git switch -c" for consistency.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> 
> * An alternative would be to list both "git checkout -b" and "git
>   switch -c", as "git checkout" is not going away (for the purpose
>   of *replacing* checkout, the switch/restore were a failed
>   experiment, even though they gained enough users to stay).
> 
> Documentation/git-branch.adoc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git c/Documentation/git-branch.adoc w/Documentation/git-branch.adoc
> index bfdf459329..a803c24858 100644
> --- c/Documentation/git-branch.adoc
> +++ w/Documentation/git-branch.adoc
> @@ -406,17 +406,17 @@ Start development from a known tag::
> ------------
> $ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
> $ cd my2.6
> $ git branch my2.6.14 v2.6.14   <1>
> $ git switch my2.6.14
> ------------
> +
> <1> This step and the next one could be combined into a single step with
> -    "checkout -b my2.6.14 v2.6.14".
> +    "git switch -c my2.6.14 v2.6.14".
> 
> Delete an unneeded branch::
> +
> ------------
> $ git clone git://git.kernel.org/.../git.git my.git
> $ cd my.git
> $ git branch -d -r origin/todo origin/html origin/man   <1>
> $ git branch -D test                                    <2>

All sensible to me. 

FWIW, the more folks I teach about switch the more folks tell me they have,
ahem, switched. And prefer it!

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-04 17:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-03 21:58 [PATCH] branch doc: consistently promote 'switch' Junio C Hamano
2026-11-04 17:52 ` Ben Knoble

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.