doc: promote "git switch"

The new command "git switch" is added to avoid the confusion of
one-command-do-all "git checkout" for new users. They are also helpful
to avoid ambiguation context.

For these reasons, promote it everywhere possible. This includes
documentation, suggestions/advice from other commands...

The "Checking out files" progress line in unpack-trees.c is also updated
to "Updating files" to be neutral to both git-checkout and git-switch.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 0cd87ddeff205ac6b5a92260f690e642f16d0875..1e2d89b174e57e0920fc22435341a8f5cff1f6c3 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -48,7 +48,7 @@ The command's second form creates a new branch head named <branchname>
 which points to the current `HEAD`, or <start-point> if given.
 
 Note that this will create the new branch, but it will not switch the
 which points to the current `HEAD`, or <start-point> if given.
 
 Note that this will create the new branch, but it will not switch the

-working tree to it; use "git checkout <newbranch>" to switch to the
+working tree to it; use "git switch <newbranch>" to switch to the

 new branch.
 
 When a local branch is started off a remote-tracking branch, Git sets up the
 new branch.
 
 When a local branch is started off a remote-tracking branch, Git sets up the


@@ -198,7 +198,7 @@ This option is only applicable in non-verbose mode.
 +
 This behavior is the default when the start point is a remote-tracking branch.
 Set the branch.autoSetupMerge configuration variable to `false` if you
 +
 This behavior is the default when the start point is a remote-tracking branch.
 Set the branch.autoSetupMerge configuration variable to `false` if you

-want `git checkout` and `git branch` to always behave as if `--no-track`
+want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track`

 were given. Set it to `always` if you want this behavior when the
 start-point is either a local or remote-tracking branch.
 
 were given. Set it to `always` if you want this behavior when the
 start-point is either a local or remote-tracking branch.
 


@@ -297,7 +297,7 @@ 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 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 checkout my2.6.14
+$ git switch my2.6.14

 ------------
 +
 <1> This step and the next one could be combined into a single step with
 ------------
 +
 <1> This step and the next one could be combined into a single step with


@@ -322,9 +322,9 @@ $ git branch -D test                                    <2>
 NOTES
 -----
 
 NOTES
 -----
 

-If you are creating a branch that you want to checkout immediately, it is
-easier to use the git checkout command with its `-b` option to create
-a branch and check it out with a single command.
+If you are creating a branch that you want to switch to immediately,
+it is easier to use the "git switch" command with its `-c` option to
+do the same thing with a single command.

 
 The options `--contains`, `--no-contains`, `--merged` and `--no-merged`
 serve four related but different purposes:
 
 The options `--contains`, `--no-contains`, `--merged` and `--no-merged`
 serve four related but different purposes:

diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index d9de9925856d79784441bc6d66623f533b844396..ee6a4144fbef1aebf422c2e393b6d38c8fb4fb60 100644 (file)
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@ -88,7 +88,8 @@ but it is explicitly forbidden at the beginning of a branch name).
 When run with `--branch` option in a repository, the input is first
 expanded for the ``previous checkout syntax''
 `@{-n}`.  For example, `@{-1}` is a way to refer the last thing that
 When run with `--branch` option in a repository, the input is first
 expanded for the ``previous checkout syntax''
 `@{-n}`.  For example, `@{-1}` is a way to refer the last thing that

-was checked out using "git checkout" operation. This option should be
+was checked out using "git switch" or "git checkout" operation.
+This option should be

 used by porcelains to accept this syntax anywhere a branch name is
 expected, so they can act as if you typed the branch name. As an
 exception note that, the ``previous checkout operation'' might result
 used by porcelains to accept this syntax anywhere a branch name is
 expected, so they can act as if you typed the branch name. As an
 exception note that, the ``previous checkout operation'' might result

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 1af85d404f5191c18a8c587df06e7c0620066236..0a24a5679e3625294f254ba663318ad01e4128a3 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -421,7 +421,7 @@ One way to test if your MUA is set up correctly is:
 * Apply it:
 
     $ git fetch <project> master:test-apply
 * Apply it:
 
     $ git fetch <project> master:test-apply

-    $ git checkout test-apply
+    $ git switch test-apply

     $ git reset --hard
     $ git am a.patch
 
     $ git reset --hard
     $ git am a.patch
 

diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 9f07f4f6ed7f5036578f1cabb788f900247761c5..261d5c1164547cc0ce423935107f178afd6956b0 100644 (file)
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -149,7 +149,7 @@ instead.
 Discussion on fork-point mode
 -----------------------------
 
 Discussion on fork-point mode
 -----------------------------
 

-After working on the `topic` branch created with `git checkout -b
+After working on the `topic` branch created with `git switch -c

 topic origin/master`, the history of remote-tracking branch
 `origin/master` may have been rewound and rebuilt, leading to a
 history of this shape:
 topic origin/master`, the history of remote-tracking branch
 `origin/master` may have been rewound and rebuilt, leading to a
 history of this shape:

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6363d674b775fd49b63fcdd3ceb42440a35dd959..c742b73a003ab63a7914649632cd1b94ec20af1d 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -17,7 +17,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 If <branch> is specified, 'git rebase' will perform an automatic
 DESCRIPTION
 -----------
 If <branch> is specified, 'git rebase' will perform an automatic

-`git checkout <branch>` before doing anything else.  Otherwise
+`git switch <branch>` before doing anything else.  Otherwise

 it remains on the current branch.
 
 If <upstream> is not specified, the upstream configured in
 it remains on the current branch.
 
 If <upstream> is not specified, the upstream configured in

diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 0cad37fb81d99c3928f1a763a79350836b8e70e6..9659abbf8e08e19076b6ac18e0c9ea75489fd68d 100644 (file)
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -230,7 +230,7 @@ $ git branch -r
   staging/master
   staging/staging-linus
   staging/staging-next
   staging/master
   staging/staging-linus
   staging/staging-next

-$ git checkout -b staging staging/master
+$ git switch -c staging staging/master

 ...
 ------------
 
 ...
 ------------
 

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index df310d2a58cc6c30dfa6d2d8609149fbcf17ecca..fe4434ad9df93eb0a9a60c1fb0128949b29ec9ab 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -91,7 +91,7 @@ For such a test, you need to merge master and topic somehow.
 One way to do it is to pull master into the topic branch:
 
 ------------
 One way to do it is to pull master into the topic branch:
 
 ------------

-       $ git checkout topic
+       $ git switch topic

        $ git merge master
 
               o---*---o---+ topic
        $ git merge master
 
               o---*---o---+ topic


@@ -113,10 +113,10 @@ the upstream might have been advanced since the test merge `+`,
 in which case the final commit graph would look like this:
 
 ------------
 in which case the final commit graph would look like this:
 
 ------------

-       $ git checkout topic
+       $ git switch topic

        $ git merge master
        $ ... work on both topic and master branches
        $ git merge master
        $ ... work on both topic and master branches

-       $ git checkout master
+       $ git switch master

        $ git merge topic
 
               o---*---o---+---o---o topic
        $ git merge topic
 
               o---*---o---+---o---o topic


@@ -136,11 +136,11 @@ merges, you could blow away the test merge, and keep building on
 top of the tip before the test merge:
 
 ------------
 top of the tip before the test merge:
 
 ------------

-       $ git checkout topic
+       $ git switch topic

        $ git merge master
        $ git reset --hard HEAD^ ;# rewind the test merge
        $ ... work on both topic and master branches
        $ git merge master
        $ git reset --hard HEAD^ ;# rewind the test merge
        $ ... work on both topic and master branches

-       $ git checkout master
+       $ git switch master

        $ git merge topic
 
               o---*---o-------o---o topic
        $ git merge topic
 
               o---*---o-------o---o topic

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 132f8e55f67b2e2a40f0058888f4f8260c51f270..cbf901efb476a6b2d7f3eeb0fa1f98831543251b 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -149,9 +149,9 @@ See also the `--amend` option to linkgit:git-commit[1].
 Undo a commit, making it a topic branch::
 +
 ------------
 Undo a commit, making it a topic branch::
 +
 ------------

-$ git branch topic/wip     <1>
-$ git reset --hard HEAD~3  <2>
-$ git checkout topic/wip   <3>
+$ git branch topic/wip          <1>
+$ git reset --hard HEAD~3       <2>
+$ git switch topic/wip          <3>

 ------------
 +
 <1> You have made some commits, but realize they were premature
 ------------
 +
 <1> You have made some commits, but realize they were premature


@@ -232,13 +232,13 @@ working tree are not in any shape to be committed yet, but you
 need to get to the other branch for a quick bugfix.
 +
 ------------
 need to get to the other branch for a quick bugfix.
 +
 ------------

-$ git checkout feature ;# you were working in "feature" branch and
-$ work work work       ;# got interrupted
+$ git switch feature  ;# you were working in "feature" branch and
+$ work work work      ;# got interrupted

 $ git commit -a -m "snapshot WIP"                 <1>
 $ git commit -a -m "snapshot WIP"                 <1>

-$ git checkout master
+$ git switch master

 $ fix fix fix
 $ git commit ;# commit with real log
 $ fix fix fix
 $ git commit ;# commit with real log

-$ git checkout feature
+$ git switch feature

 $ git reset --soft HEAD^ ;# go back to WIP state  <2>
 $ git reset                                       <3>
 ------------
 $ git reset --soft HEAD^ ;# go back to WIP state  <2>
 $ git reset                                       <3>
 ------------


@@ -279,18 +279,18 @@ reset it while keeping the changes in your working tree.
 +
 ------------
 $ git tag start
 +
 ------------
 $ git tag start

-$ git checkout -b branch1
+$ git switch -c branch1

 $ edit
 $ git commit ...                            <1>
 $ edit
 $ edit
 $ git commit ...                            <1>
 $ edit

-$ git checkout -b branch2                   <2>
+$ git switch -c branch2                     <2>

 $ git reset --keep start                    <3>
 ------------
 +
 <1> This commits your first edits in `branch1`.
 <2> In the ideal world, you could have realized that the earlier
     commit did not belong to the new topic when you created and switched
 $ git reset --keep start                    <3>
 ------------
 +
 <1> This commits your first edits in `branch1`.
 <2> In the ideal world, you could have realized that the earlier
     commit did not belong to the new topic when you created and switched

-    to `branch2` (i.e. `git checkout -b branch2 start`), but nobody is
+    to `branch2` (i.e. `git switch -c branch2 start`), but nobody is

     perfect.
 <3> But you can use `reset --keep` to remove the unwanted commit after
     you switched to `branch2`.
     perfect.
 <3> But you can use `reset --keep` to remove the unwanted commit after
     you switched to `branch2`.

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 7ef8c4791177b2b54c61573c044659fbbacea9b8..ebb6282db3ef7a8a96681dd21cd8a02ccd3a0cdd 100644 (file)
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -235,12 +235,12 @@ return to your original branch to make the emergency fix, like this:
 +
 ----------------------------------------------------------------
 # ... hack hack hack ...
 +
 ----------------------------------------------------------------
 # ... hack hack hack ...

-$ git checkout -b my_wip
+$ git switch -c my_wip

 $ git commit -a -m "WIP"
 $ git commit -a -m "WIP"

-$ git checkout master
+$ git switch master

 $ edit emergency fix
 $ git commit -a -m "Fix in a hurry"
 $ edit emergency fix
 $ git commit -a -m "Fix in a hurry"

-$ git checkout my_wip
+$ git switch my_wip

 $ git reset --soft HEAD^
 # ... continue hacking ...
 ----------------------------------------------------------------
 $ git reset --soft HEAD^
 # ... continue hacking ...
 ----------------------------------------------------------------


@@ -293,7 +293,8 @@ SEE ALSO
 linkgit:git-checkout[1],
 linkgit:git-commit[1],
 linkgit:git-reflog[1],
 linkgit:git-checkout[1],
 linkgit:git-commit[1],
 linkgit:git-reflog[1],

-linkgit:git-reset[1]
+linkgit:git-reset[1],
+linkgit:git-switch[1]

 
 GIT
 ---
 
 GIT
 ---

diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index e29a9effccbcf439fec8a8fe9bfd1927f58439d7..f880d21dfb520c4a7bed90ccd0f2cc9d3961ecf7 100644 (file)
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -741,7 +741,7 @@ used earlier, and create a branch in it. You do that by simply just
 saying that you want to check out a new branch:
 
 ------------
 saying that you want to check out a new branch:
 
 ------------

-$ git checkout -b mybranch
+$ git switch -c mybranch

 ------------
 
 will create a new branch based at the current `HEAD` position, and switch
 ------------
 
 will create a new branch based at the current `HEAD` position, and switch


@@ -755,7 +755,7 @@ just telling 'git checkout' what the base of the checkout would be.
 In other words, if you have an earlier tag or branch, you'd just do
 
 ------------
 In other words, if you have an earlier tag or branch, you'd just do
 
 ------------

-$ git checkout -b mybranch earlier-commit
+$ git switch -c mybranch earlier-commit

 ------------
 
 and it would create the new branch `mybranch` at the earlier commit,
 ------------
 
 and it would create the new branch `mybranch` at the earlier commit,


@@ -765,7 +765,7 @@ and check out the state at that time.
 You can always just jump back to your original `master` branch by doing
 
 ------------
 You can always just jump back to your original `master` branch by doing
 
 ------------

-$ git checkout master
+$ git switch master

 ------------
 
 (or any other branch-name, for that matter) and if you forget which
 ------------
 
 (or any other branch-name, for that matter) and if you forget which


@@ -794,7 +794,7 @@ $ git branch <branchname> [startingpoint]
 
 which will simply _create_ the branch, but will not do anything further.
 You can then later -- once you decide that you want to actually develop
 
 which will simply _create_ the branch, but will not do anything further.
 You can then later -- once you decide that you want to actually develop

-on that branch -- switch to that branch with a regular 'git checkout'
+on that branch -- switch to that branch with a regular 'git switch'

 with the branchname as the argument.
 
 
 with the branchname as the argument.
 
 


@@ -808,7 +808,7 @@ being the same as the original `master` branch, let's make sure we're in
 that branch, and do some work there.
 
 ------------------------------------------------
 that branch, and do some work there.
 
 ------------------------------------------------

-$ git checkout mybranch
+$ git switch mybranch

 $ echo "Work, work, work" >>hello
 $ git commit -m "Some work." -i hello
 ------------------------------------------------
 $ echo "Work, work, work" >>hello
 $ git commit -m "Some work." -i hello
 ------------------------------------------------


@@ -825,7 +825,7 @@ does some work in the original branch, and simulate that by going back
 to the master branch, and editing the same file differently there:
 
 ------------
 to the master branch, and editing the same file differently there:
 
 ------------

-$ git checkout master
+$ git switch master

 ------------
 
 Here, take a moment to look at the contents of `hello`, and notice how they
 ------------
 
 Here, take a moment to look at the contents of `hello`, and notice how they


@@ -958,7 +958,7 @@ to the `master` branch. Let's go back to `mybranch`, and run
 'git merge' to get the "upstream changes" back to your branch.
 
 ------------
 'git merge' to get the "upstream changes" back to your branch.
 
 ------------

-$ git checkout mybranch
+$ git switch mybranch

 $ git merge -m "Merge upstream changes." master
 ------------
 
 $ git merge -m "Merge upstream changes." master
 ------------
 


@@ -1133,9 +1133,8 @@ Remember, before running 'git merge', our `master` head was at
 work." commit.
 
 ------------
 work." commit.
 
 ------------

-$ git checkout mybranch
-$ git reset --hard master^2
-$ git checkout master
+$ git switch -C mybranch master^2
+$ git switch master

 $ git reset --hard master^
 ------------
 
 $ git reset --hard master^
 ------------
 

diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt
index 9f2528fc8c81622c237f7bc80289137d8f4f750b..ad455f3e39870e2f350fa6b6f9466392f8baf0cc 100644 (file)
--- a/Documentation/giteveryday.txt
+++ b/Documentation/giteveryday.txt
@@ -41,7 +41,7 @@ following commands.
 
   * linkgit:git-log[1] to see what happened.
 
 
   * linkgit:git-log[1] to see what happened.
 

-  * linkgit:git-checkout[1] and linkgit:git-branch[1] to switch
+  * linkgit:git-switch[1] and linkgit:git-branch[1] to switch

     branches.
 
   * linkgit:git-add[1] to manage the index file.
     branches.
 
   * linkgit:git-add[1] to manage the index file.


@@ -80,7 +80,7 @@ $ git tag v2.43 <2>
 Create a topic branch and develop.::
 +
 ------------
 Create a topic branch and develop.::
 +
 ------------

-$ git checkout -b alsa-audio <1>
+$ git switch -c alsa-audio <1>

 $ edit/compile/test
 $ git checkout -- curses/ux_audio_oss.c <2>
 $ git add curses/ux_audio_alsa.c <3>
 $ edit/compile/test
 $ git checkout -- curses/ux_audio_oss.c <2>
 $ git add curses/ux_audio_alsa.c <3>


@@ -90,7 +90,7 @@ $ git commit -a -s <5>
 $ edit/compile/test
 $ git diff HEAD^ <6>
 $ git commit -a --amend <7>
 $ edit/compile/test
 $ git diff HEAD^ <6>
 $ git commit -a --amend <7>

-$ git checkout master <8>
+$ git switch master <8>

 $ git merge alsa-audio <9>
 $ git log --since='3 days ago' <10>
 $ git log v2.43.. curses/ <11>
 $ git merge alsa-audio <9>
 $ git log --since='3 days ago' <10>
 $ git log v2.43.. curses/ <11>


@@ -148,11 +148,11 @@ Clone the upstream and work on it.  Feed changes to upstream.::
 ------------
 $ git clone git://git.kernel.org/pub/scm/.../torvalds/linux-2.6 my2.6
 $ cd my2.6
 ------------
 $ git clone git://git.kernel.org/pub/scm/.../torvalds/linux-2.6 my2.6
 $ cd my2.6

-$ git checkout -b mine master <1>
+$ git switch -c mine master <1>

 $ edit/compile/test; git commit -a -s <2>
 $ git format-patch master <3>
 $ git send-email --to="person <email@example.com>" 00*.patch <4>
 $ edit/compile/test; git commit -a -s <2>
 $ git format-patch master <3>
 $ git send-email --to="person <email@example.com>" 00*.patch <4>

-$ git checkout master <5>
+$ git switch master <5>

 $ git pull <6>
 $ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <7>
 $ git ls-remote --heads http://git.kernel.org/.../jgarzik/libata-dev.git <8>
 $ git pull <6>
 $ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <7>
 $ git ls-remote --heads http://git.kernel.org/.../jgarzik/libata-dev.git <8>


@@ -194,7 +194,7 @@ satellite$ edit/compile/test/commit
 satellite$ git push origin <4>
 
 mothership$ cd frotz
 satellite$ git push origin <4>
 
 mothership$ cd frotz

-mothership$ git checkout master
+mothership$ git switch master

 mothership$ git merge satellite/master <5>
 ------------
 +
 mothership$ git merge satellite/master <5>
 ------------
 +


@@ -216,7 +216,7 @@ machine into the master branch.
 Branch off of a specific tag.::
 +
 ------------
 Branch off of a specific tag.::
 +
 ------------

-$ git checkout -b private2.6.14 v2.6.14 <1>
+$ git switch -c private2.6.14 v2.6.14 <1>

 $ edit/compile/test; git commit -a
 $ git checkout master
 $ git cherry-pick v2.6.14..private2.6.14 <2>
 $ edit/compile/test; git commit -a
 $ git checkout master
 $ git cherry-pick v2.6.14..private2.6.14 <2>


@@ -274,14 +274,14 @@ $ mailx <3>
 & s 2 3 4 5 ./+to-apply
 & s 7 8 ./+hold-linus
 & q
 & s 2 3 4 5 ./+to-apply
 & s 7 8 ./+hold-linus
 & q

-$ git checkout -b topic/one master
+$ git switch -c topic/one master

 $ git am -3 -i -s ./+to-apply <4>
 $ compile/test
 $ git am -3 -i -s ./+to-apply <4>
 $ compile/test

-$ git checkout -b hold/linus && git am -3 -i -s ./+hold-linus <5>
-$ git checkout topic/one && git rebase master <6>
-$ git checkout pu && git reset --hard next <7>
+$ git switch -c hold/linus && git am -3 -i -s ./+hold-linus <5>
+$ git switch topic/one && git rebase master <6>
+$ git switch -C pu next <7>

 $ git merge topic/one topic/two && git merge hold/linus <8>
 $ git merge topic/one topic/two && git merge hold/linus <8>

-$ git checkout maint
+$ git switch maint

 $ git cherry-pick master~4 <9>
 $ compile/test
 $ git tag -s -m "GIT 0.99.9x" v0.99.9x <10>
 $ git cherry-pick master~4 <9>
 $ compile/test
 $ git tag -s -m "GIT 0.99.9x" v0.99.9x <10>

diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 242de31cb6ccc6600b94a68a9efd215df2cb71f7..e6ad6b5f8d276a0f8894b5c2bb2e9affb5be07d3 100644 (file)
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -207,7 +207,7 @@ automatically.  The asterisk marks the branch you are currently on;
 type
 
 ------------------------------------------------
 type
 
 ------------------------------------------------

-$ git checkout experimental
+$ git switch experimental

 ------------------------------------------------
 
 to switch to the experimental branch.  Now edit a file, commit the
 ------------------------------------------------
 
 to switch to the experimental branch.  Now edit a file, commit the


@@ -216,7 +216,7 @@ change, and switch back to the master branch:
 ------------------------------------------------
 (edit file)
 $ git commit -a
 ------------------------------------------------
 (edit file)
 $ git commit -a

-$ git checkout master
+$ git switch master

 ------------------------------------------------
 
 Check that the change you made is no longer visible, since it was
 ------------------------------------------------
 
 Check that the change you made is no longer visible, since it was

diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index ca11c7bdafb91bc2f6ae71ca18a2f6b45e5f38b0..abc0dc6bc79bfaf088202114ecee1dbe1f704dc9 100644 (file)
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@ -301,8 +301,7 @@ topics on 'next':
 .Rewind and rebuild next
 [caption="Recipe: "]
 =====================================
 .Rewind and rebuild next
 [caption="Recipe: "]
 =====================================

-* `git checkout next`
-* `git reset --hard master`
+* `git switch -C next master`

 * `git merge ai/topic_in_next1`
 * `git merge ai/topic_in_next2`
 * ...
 * `git merge ai/topic_in_next1`
 * `git merge ai/topic_in_next2`
 * ...

diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 72daa20e76fa0a0c10feaf37f927797ad1445934..a1c7a65da643fead6608f1d597b3404a30ed18af 100644 (file)
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -115,7 +115,7 @@ Here's an example to make it more clear:
 ------------------------------
 $ git config push.default current
 $ git config remote.pushdefault myfork
 ------------------------------
 $ git config push.default current
 $ git config remote.pushdefault myfork

-$ git checkout -b mybranch origin/master
+$ git switch -c mybranch origin/master

 
 $ git rev-parse --symbolic-full-name @{upstream}
 refs/remotes/origin/master
 
 $ git rev-parse --symbolic-full-name @{upstream}
 refs/remotes/origin/master

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index eff78902742ab0c4c9855eed11b67cf576c0e4d4..94799faa2b44b95d7191e5d9b81341c9dcceac9b 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -122,10 +122,10 @@ Tags are expected to always point at the same version of a project,
 while heads are expected to advance as development progresses.
 
 Create a new branch head pointing to one of these versions and check it
 while heads are expected to advance as development progresses.
 
 Create a new branch head pointing to one of these versions and check it

-out using linkgit:git-checkout[1]:
+out using linkgit:git-switch[1]:

 
 ------------------------------------------------
 
 ------------------------------------------------

-$ git checkout -b new v2.6.13
+$ git switch -c new v2.6.13

 ------------------------------------------------
 
 The working directory then reflects the contents that the project had
 ------------------------------------------------
 
 The working directory then reflects the contents that the project had


@@ -282,10 +282,10 @@ a summary of the commands:
        this command will fail with a warning.
 `git branch -D <branch>`::
        delete the branch `<branch>` irrespective of its merged status.
        this command will fail with a warning.
 `git branch -D <branch>`::
        delete the branch `<branch>` irrespective of its merged status.

-`git checkout <branch>`::
+`git switch <branch>`::

        make the current branch `<branch>`, updating the working
        directory to reflect the version referenced by `<branch>`.
        make the current branch `<branch>`, updating the working
        directory to reflect the version referenced by `<branch>`.

-`git checkout -b <new> <start-point>`::
+`git switch -c <new> <start-point>`::

        create a new branch `<new>` referencing `<start-point>`, and
        check it out.
 
        create a new branch `<new>` referencing `<start-point>`, and
        check it out.
 


@@ -302,22 +302,22 @@ ref: refs/heads/master
 Examining an old version without creating a new branch
 ------------------------------------------------------
 
 Examining an old version without creating a new branch
 ------------------------------------------------------
 

-The `git checkout` command normally expects a branch head, but will also
-accept an arbitrary commit; for example, you can check out the commit
-referenced by a tag:
+The `git switch` command normally expects a branch head, but will also
+accept an arbitrary commit when invoked with --detach; for example,
+you can check out the commit referenced by a tag:

 
 ------------------------------------------------
 
 ------------------------------------------------

-$ git checkout v2.6.17
+$ git switch --detach v2.6.17

 Note: checking out 'v2.6.17'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
 Note: checking out 'v2.6.17'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this

-state without impacting any branches by performing another checkout.
+state without impacting any branches by performing another switch.

 
 If you want to create a new branch to retain commits you create, you may
 
 If you want to create a new branch to retain commits you create, you may

-do so (now or later) by using -b with the checkout command again. Example:
+do so (now or later) by using -c with the switch command again. Example:

 
 

-  git checkout -b new_branch_name
+  git switch -c new_branch_name

 
 HEAD is now at 427abfa Linux v2.6.17
 ------------------------------------------------
 
 HEAD is now at 427abfa Linux v2.6.17
 ------------------------------------------------


@@ -373,7 +373,7 @@ You might want to build on one of these remote-tracking branches
 on a branch of your own, just as you would for a tag:
 
 ------------------------------------------------
 on a branch of your own, just as you would for a tag:
 
 ------------------------------------------------

-$ git checkout -b my-todo-copy origin/todo
+$ git switch -c my-todo-copy origin/todo

 ------------------------------------------------
 
 You can also check out `origin/todo` directly to examine it or
 ------------------------------------------------
 
 You can also check out `origin/todo` directly to examine it or


@@ -2211,8 +2211,8 @@ $ git branch --track release origin/master
 These can be easily kept up to date using linkgit:git-pull[1].
 
 -------------------------------------------------
 These can be easily kept up to date using linkgit:git-pull[1].
 
 -------------------------------------------------

-$ git checkout test && git pull
-$ git checkout release && git pull
+$ git switch test && git pull
+$ git switch release && git pull

 -------------------------------------------------
 
 Important note!  If you have any local changes in these branches, then
 -------------------------------------------------
 
 Important note!  If you have any local changes in these branches, then


@@ -2264,7 +2264,7 @@ tested changes
 2) help future bug hunters that use `git bisect` to find problems
 
 -------------------------------------------------
 2) help future bug hunters that use `git bisect` to find problems
 
 -------------------------------------------------

-$ git checkout -b speed-up-spinlocks v2.6.35
+$ git switch -c speed-up-spinlocks v2.6.35

 -------------------------------------------------
 
 Now you apply the patch(es), run some tests, and commit the change(s).  If
 -------------------------------------------------
 
 Now you apply the patch(es), run some tests, and commit the change(s).  If


@@ -2279,7 +2279,7 @@ When you are happy with the state of this change, you can merge it into the
 "test" branch in preparation to make it public:
 
 -------------------------------------------------
 "test" branch in preparation to make it public:
 
 -------------------------------------------------

-$ git checkout test && git merge speed-up-spinlocks
+$ git switch test && git merge speed-up-spinlocks

 -------------------------------------------------
 
 It is unlikely that you would have any conflicts here ... but you might if you
 -------------------------------------------------
 
 It is unlikely that you would have any conflicts here ... but you might if you


@@ -2291,7 +2291,7 @@ see the value of keeping each patch (or patch series) in its own branch.  It
 means that the patches can be moved into the `release` tree in any order.
 
 -------------------------------------------------
 means that the patches can be moved into the `release` tree in any order.
 
 -------------------------------------------------

-$ git checkout release && git merge speed-up-spinlocks
+$ git switch release && git merge speed-up-spinlocks

 -------------------------------------------------
 
 After a while, you will have a number of branches, and despite the
 -------------------------------------------------
 
 After a while, you will have a number of branches, and despite the


@@ -2512,7 +2512,7 @@ Suppose that you create a branch `mywork` on a remote-tracking branch
 `origin`, and create some commits on top of it:
 
 -------------------------------------------------
 `origin`, and create some commits on top of it:
 
 -------------------------------------------------

-$ git checkout -b mywork origin
+$ git switch -c mywork origin

 $ vi file.txt
 $ git commit
 $ vi otherfile.txt
 $ vi file.txt
 $ git commit
 $ vi otherfile.txt


@@ -2552,7 +2552,7 @@ commits without any merges, you may instead choose to use
 linkgit:git-rebase[1]:
 
 -------------------------------------------------
 linkgit:git-rebase[1]:
 
 -------------------------------------------------

-$ git checkout mywork
+$ git switch mywork

 $ git rebase origin
 -------------------------------------------------
 
 $ git rebase origin
 -------------------------------------------------
 


@@ -3668,13 +3668,13 @@ change within the submodule, and then update the superproject to reference the
 new commit:
 
 -------------------------------------------------
 new commit:
 
 -------------------------------------------------

-$ git checkout master
+$ git switch master

 -------------------------------------------------
 
 or
 
 -------------------------------------------------
 -------------------------------------------------
 
 or
 
 -------------------------------------------------

-$ git checkout -b fix-up
+$ git switch -c fix-up

 -------------------------------------------------
 
 then
 -------------------------------------------------
 
 then


@@ -4194,7 +4194,7 @@ start.
 A good place to start is with the contents of the initial commit, with:
 
 ----------------------------------------------------
 A good place to start is with the contents of the initial commit, with:
 
 ----------------------------------------------------

-$ git checkout e83c5163
+$ git switch --detach e83c5163

 ----------------------------------------------------
 
 The initial revision lays the foundation for almost everything Git has
 ----------------------------------------------------
 
 The initial revision lays the foundation for almost everything Git has


@@ -4437,10 +4437,10 @@ Managing branches
 -----------------
 
 -----------------------------------------------
 -----------------
 
 -----------------------------------------------

-$ git branch        # list all local branches in this repo
-$ git checkout test  # switch working directory to branch "test"
-$ git branch new     # create branch "new" starting at current HEAD
-$ git branch -d new  # delete branch "new"
+$ git branch                   # list all local branches in this repo
+$ git switch test              # switch working directory to branch "test"
+$ git branch new               # create branch "new" starting at current HEAD
+$ git branch -d new            # delete branch "new"

 -----------------------------------------------
 
 Instead of basing a new branch on current HEAD (the default), use:
 -----------------------------------------------
 
 Instead of basing a new branch on current HEAD (the default), use:


@@ -4456,7 +4456,7 @@ $ git branch new test~10 # ten commits before tip of branch "test"
 Create and switch to a new branch at the same time:
 
 -----------------------------------------------
 Create and switch to a new branch at the same time:
 
 -----------------------------------------------

-$ git checkout -b new v2.6.15
+$ git switch -c new v2.6.15

 -----------------------------------------------
 
 Update and examine branches from the repository you cloned from:
 -----------------------------------------------
 
 Update and examine branches from the repository you cloned from:


@@ -4467,7 +4467,7 @@ $ git branch -r           # list
   origin/master
   origin/next
   ...
   origin/master
   origin/next
   ...

-$ git checkout -b masterwork origin/master
+$ git switch -c masterwork origin/master

 -----------------------------------------------
 
 Fetch a branch from a different repository, and give it a new
 -----------------------------------------------
 
 Fetch a branch from a different repository, and give it a new

diff --git a/advice.c b/advice.c
index b2248256376b5225a597e7d439106985d7f07075..24a7741083e14d28557bdcd358af0857be2e96e9 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -191,20 +191,20 @@ void NORETURN die_conclude_merge(void)
 void detach_advice(const char *new_name)
 {
        const char *fmt =
 void detach_advice(const char *new_name)
 {
        const char *fmt =

-       _("Note: checking out '%s'.\n"
+       _("Note: switching to '%s'.\n"

        "\n"
        "You are in 'detached HEAD' state. You can look around, make experimental\n"
        "changes and commit them, and you can discard any commits you make in this\n"
        "\n"
        "You are in 'detached HEAD' state. You can look around, make experimental\n"
        "changes and commit them, and you can discard any commits you make in this\n"

-       "state without impacting any branches by performing another checkout.\n"
+       "state without impacting any branches by switching back to a branch.\n"

        "\n"
        "If you want to create a new branch to retain commits you create, you may\n"
        "\n"
        "If you want to create a new branch to retain commits you create, you may\n"

-       "do so (now or later) by using -b with the checkout command again. Example:\n"
+       "do so (now or later) by using -c with the switch command. Example:\n"

        "\n"
        "\n"

-       "  git checkout -b <new-branch-name>\n"
+       "  git switch -c <new-branch-name>\n"

        "\n"
        "\n"

-       "Or undo this checkout with:\n"
+       "Or undo this operation with:\n"

        "\n"
        "\n"

-       "  git checkout -\n"
+       "  git switch -\n"

        "\n"
        "Turn off this advice by setting config variable advice.detachedHead to false\n\n");
 
        "\n"
        "Turn off this advice by setting config variable advice.detachedHead to false\n\n");
 

diff --git a/sha1-name.c b/sha1-name.c
index 6dda2c16df1026e50b7d9be255b6bbfc4e92725c..da0518c8e3c42ee3fe88bf7b5c29fcde4fcd8074 100644 (file)
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -743,7 +743,7 @@ static int get_oid_basic(const char *str, int len, struct object_id *oid,
        "because it will be ignored when you just specify 40-hex. These refs\n"
        "may be created by mistake. For example,\n"
        "\n"
        "because it will be ignored when you just specify 40-hex. These refs\n"
        "may be created by mistake. For example,\n"
        "\n"

-       "  git checkout -b $br $(git rev-parse ...)\n"
+       "  git switch -c $br $(git rev-parse ...)\n"

        "\n"
        "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
        "examine these refs and maybe delete them. Turn this message off by\n"
        "\n"
        "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
        "examine these refs and maybe delete them. Turn this message off by\n"

diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index 743c7248a21d6967c0717973830dc1393f5109ef..b748db9946eff1f1c4f45ffae61ee84f15db0f05 100755 (executable)
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -195,20 +195,20 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
 
        # The first detach operation is more chatty than the following ones.
        cat >1st_detach <<-EOF &&
 
        # The first detach operation is more chatty than the following ones.
        cat >1st_detach <<-EOF &&

-       Note: checking out 'HEAD^'.
+       Note: switching to 'HEAD^'.

 
        You are in 'detached HEAD' state. You can look around, make experimental
        changes and commit them, and you can discard any commits you make in this
 
        You are in 'detached HEAD' state. You can look around, make experimental
        changes and commit them, and you can discard any commits you make in this

-       state without impacting any branches by performing another checkout.
+       state without impacting any branches by switching back to a branch.

 
        If you want to create a new branch to retain commits you create, you may
 
        If you want to create a new branch to retain commits you create, you may

-       do so (now or later) by using -b with the checkout command again. Example:
+       do so (now or later) by using -c with the switch command. Example:

 
 

-         git checkout -b <new-branch-name>
+         git switch -c <new-branch-name>

 
 

-       Or undo this checkout with:
+       Or undo this operation with:

 
 

-         git checkout -
+         git switch -

 
        Turn off this advice by setting config variable advice.detachedHead to false
 
 
        Turn off this advice by setting config variable advice.detachedHead to false
 


@@ -277,20 +277,20 @@ test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked
 
        # The first detach operation is more chatty than the following ones.
        cat >1st_detach <<-EOF &&
 
        # The first detach operation is more chatty than the following ones.
        cat >1st_detach <<-EOF &&

-       Note: checking out 'HEAD^'.
+       Note: switching to 'HEAD^'.

 
        You are in 'detached HEAD' state. You can look around, make experimental
        changes and commit them, and you can discard any commits you make in this
 
        You are in 'detached HEAD' state. You can look around, make experimental
        changes and commit them, and you can discard any commits you make in this

-       state without impacting any branches by performing another checkout.
+       state without impacting any branches by switching back to a branch.

 
        If you want to create a new branch to retain commits you create, you may
 
        If you want to create a new branch to retain commits you create, you may

-       do so (now or later) by using -b with the checkout command again. Example:
+       do so (now or later) by using -c with the switch command. Example:

 
 

-         git checkout -b <new-branch-name>
+         git switch -c <new-branch-name>

 
 

-       Or undo this checkout with:
+       Or undo this operation with:

 
 

-         git checkout -
+         git switch -

 
        Turn off this advice by setting config variable advice.detachedHead to false
 
 
        Turn off this advice by setting config variable advice.detachedHead to false
 

diff --git a/unpack-trees.c b/unpack-trees.c
index 22c41a3ba80971e5edc6bbf02eb6ea59d3c41277..5ff64a983d8e8b09e1d842c5243300a030a929c9 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -313,7 +313,7 @@ static struct progress *get_progress(struct unpack_trees_options *o)
                        total++;
        }
 
                        total++;
        }
 

-       return start_delayed_progress(_("Checking out files"), total);
+       return start_delayed_progress(_("Updating files"), total);

 }
 
 static void setup_collided_checkout_detection(struct checkout *state,
 }
 
 static void setup_collided_checkout_detection(struct checkout *state,