Merge branch 'master' into update-gitlab-section

HonkingGoose · HonkingGoose · commit 4add380dceb2 · 2020-08-28T21:51:56.000+02:00
diff --git a/A-git-in-other-environments.asc b/A-git-in-other-environments.asc
@@ -13,8 +13,6 @@ include::book/A-git-in-other-environments/sections/visualstudio.asc[]
 
 include::book/A-git-in-other-environments/sections/visualstudiocode.asc[]
 
-include::book/A-git-in-other-environments/sections/eclipse.asc[]
-
 include::book/A-git-in-other-environments/sections/jetbrainsides.asc[]
 
 include::book/A-git-in-other-environments/sections/sublimetext.asc[]
diff --git a/book/01-introduction/sections/what-is-git.asc b/book/01-introduction/sections/what-is-git.asc
@@ -1,3 +1,4 @@
+[[_what_is_git]]
 === What is Git?
 
 So, what is Git in a nutshell?
diff --git a/book/02-git-basics/sections/tagging.asc b/book/02-git-basics/sections/tagging.asc
@@ -263,16 +263,22 @@ If you want to view the versions of files a tag is pointing to, you can do a `gi
 [source,console]
 ----
 $ git checkout v2.0.0
-Note: checking out 'v2.0.0'.
+Note: switching to 'v2.0.0'.
 
 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.
 
 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>
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at 99ada87... Merge pull request #89 from schacon/appendix-final
 
diff --git a/book/03-git-branching/sections/branch-management.asc b/book/03-git-branching/sections/branch-management.asc
@@ -168,10 +168,11 @@ But the remote still has a _master_ branch.
 Other collaborators will continue to use the _master_ branch as the base of their work, until you make some further changes.
 
 Now you have a few more tasks in front of you to complete the transition:
+
 * Any projects that depend on this one will need to update their code and/or configuration.
 * Update any test-runner configuration files.
 * Adjust build and release scripts.
-* Redirect settings on your repo host for things like thee repo's default branch, merge rules, and other things that match branch names.
+* Redirect settings on your repo host for things like the repo's default branch, merge rules, and other things that match branch names.
 * Update references to the old branch in documentation.
 * Close or merge any pull requests that target the old branch.
 
diff --git a/book/03-git-branching/sections/nutshell.asc b/book/03-git-branching/sections/nutshell.asc
@@ -3,13 +3,13 @@
 
 To really understand the way Git does branching, we need to take a step back and examine how Git stores its data.
 
-As you may remember from <<ch01-getting-started#ch01-getting-started>>, Git doesn't store data as a series of changesets or differences, but instead as a series of _snapshots_.
+As you may remember from <<ch01-getting-started#_what_is_git>>, Git doesn't store data as a series of changesets or differences, but instead as a series of _snapshots_.
 
 When you make a commit, Git stores a commit object that contains a pointer to the snapshot of the content you staged.
 This object also contains the author's name and email address, the message that you typed, and pointers to the commit or commits that directly came before this commit (its parent or parents): zero parents for the initial commit, one parent for a normal commit, and multiple parents for a commit that results from a merge of two or more branches.
 
 To visualize this, let's assume that you have a directory containing three files, and you stage them all and commit.
-Staging the files computes a checksum for each one (the SHA-1 hash we mentioned in <<ch01-getting-started#ch01-getting-started>>), stores that version of the file in the Git repository (Git refers to them as _blobs_), and adds that checksum to the staging area:
+Staging the files computes a checksum for each one (the SHA-1 hash we mentioned in <<ch01-getting-started#_what_is_git>>), stores that version of the file in the Git repository (Git refers to them as _blobs_), and adds that checksum to the staging area:
 
 [source,console]
 ----
diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc
@@ -787,7 +787,7 @@ Result: OK
 
 [TIP]
 ====
-For help on confuring your system and email, more tips and tricks, and a sandbox to send a trial patch via email, go to [git-send-email.io](https://git-send-email.io/).
+For help on configuring your system and email, more tips and tricks, and a sandbox to send a trial patch via email, go to [git-send-email.io](https://git-send-email.io/).
 ====
 
 ==== Summary
diff --git a/book/A-git-in-other-environments/sections/eclipse.asc b/book/A-git-in-other-environments/sections/eclipse.asc
diff --git a/images/egit.png b/images/egit.png
diff --git a/status.json b/status.json
@@ -107,7 +107,6 @@
     "A-git-in-other-environments": {
       "1-git-other-environments.asc": 0,
       "sections/bash.asc": 0,
-      "sections/eclipse.asc": 0,
       "sections/guis.asc": 0,
       "sections/powershell.asc": 0,
       "sections/visualstudio.asc": 0,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+[[_what_is_git]]`
`1`	`2`	`=== What is Git?`
`2`	`3`
`3`	`4`	`So, what is Git in a nutshell?`