Skip to content

Commit bf0348e

Browse files
committed
Merge branch 'master' into update-gitlab-section
2 parents d926d59 + 26e50c1 commit bf0348e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

book/01-introduction/sections/what-is-git.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[[_what_is_git]]
1+
[[what_is_git_section]]
22
=== What is Git?
33

44
So, what is Git in a nutshell?

book/02-git-basics/sections/tagging.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ Turn off this advice by setting config variable advice.detachedHead to false
282282
283283
HEAD is now at 99ada87... Merge pull request #89 from schacon/appendix-final
284284
285-
$ git checkout 2.0-beta-0.1
285+
$ git checkout v2.0-beta-0.1
286286
Previous HEAD position was 99ada87... Merge pull request #89 from schacon/appendix-final
287287
HEAD is now at df3f601... Add atlas.json and cover image
288288
----

book/03-git-branching/sections/branch-management.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ $ git branch --no-merged master
7777
==== Changing a branch name
7878

7979
[CAUTION]
80-
----
80+
====
8181
Do not rename branches that are still in use by other collaborators.
8282
Do not rename a branch like master/main/mainline without having read the section "Changing the master branch name".
83-
----
83+
====
8484

8585
Suppose you have a branch that is called _bad-branch-name_ and you want to change it to _corrected-branch-name_, while keeping all history.
8686
You also want to change the branch name on the remote (GitHub, GitLab, other server).

book/03-git-branching/sections/nutshell.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
To really understand the way Git does branching, we need to take a step back and examine how Git stores its data.
55

6-
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_.
6+
As you may remember from <<ch01-getting-started#what_is_git_section>>, Git doesn't store data as a series of changesets or differences, but instead as a series of _snapshots_.
77

88
When you make a commit, Git stores a commit object that contains a pointer to the snapshot of the content you staged.
99
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.
1010

1111
To visualize this, let's assume that you have a directory containing three files, and you stage them all and commit.
12-
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:
12+
Staging the files computes a checksum for each one (the SHA-1 hash we mentioned in <<ch01-getting-started#what_is_git_section>>), stores that version of the file in the Git repository (Git refers to them as _blobs_), and adds that checksum to the staging area:
1313

1414
[source,console]
1515
----

0 commit comments

Comments
 (0)