Skip to content

Commit e96bfdc

Browse files
authored
Merge pull request #276 from AndrewMurphy2/checksums
Branches in a Nutshell: Use unambiguous checksums
2 parents e95aba0 + dbb5fd9 commit e96bfdc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[[_git_branches_overview]]
1+
[[_git_branches_overview]]
22
=== Branches in a Nutshell
33

44
To really understand the way Git does branching, we need to take a step back and examine how Git stores its data.
@@ -9,7 +9,7 @@ When you make a commit, Git stores a commit object that contains a pointer to th
99
This object also contains the author's name and email, 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 checksums each one (the SHA-1 hash we mentioned in <<_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:
12+
Staging the files computes a checksum for each one (the SHA-1 hash we mentioned in <<_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:
1313

1414
[source,console]
1515
----

0 commit comments

Comments
 (0)