From 8c1af543c3db39fb0e215efc236d6ef90b692c35 Mon Sep 17 00:00:00 2001 From: Tomas Fiers Date: Fri, 28 Aug 2020 22:44:55 +0200 Subject: [PATCH 1/3] Update nutshell.asc --- book/03-git-branching/sections/nutshell.asc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/03-git-branching/sections/nutshell.asc b/book/03-git-branching/sections/nutshell.asc index 6199b0276..3c668cc7a 100644 --- 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 <>, Git doesn't store data as a series of changesets or differences, but instead as a series of _snapshots_. +As you may remember from <>, 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 <>), 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 <>), 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] ---- From ed86983a50116cc25f9a67e12a472781fe11bf67 Mon Sep 17 00:00:00 2001 From: Tomas Fiers Date: Fri, 28 Aug 2020 22:44:57 +0200 Subject: [PATCH 2/3] Update what-is-git.asc --- book/01-introduction/sections/what-is-git.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/01-introduction/sections/what-is-git.asc b/book/01-introduction/sections/what-is-git.asc index 931554a6c..80f219ead 100644 --- a/book/01-introduction/sections/what-is-git.asc +++ b/book/01-introduction/sections/what-is-git.asc @@ -1,4 +1,4 @@ -[[_what_is_git]] +[[section__what_is_git]] === What is Git? So, what is Git in a nutshell? From 73d65ac4bcaad645ad8e8cb008fe885d223ddf52 Mon Sep 17 00:00:00 2001 From: Tomas Fiers Date: Fri, 28 Aug 2020 22:20:37 +0100 Subject: [PATCH 3/3] Rename section identifier to be consistent --- book/01-introduction/sections/what-is-git.asc | 2 +- book/03-git-branching/sections/nutshell.asc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/book/01-introduction/sections/what-is-git.asc b/book/01-introduction/sections/what-is-git.asc index 80f219ead..8ad20e862 100644 --- a/book/01-introduction/sections/what-is-git.asc +++ b/book/01-introduction/sections/what-is-git.asc @@ -1,4 +1,4 @@ -[[section__what_is_git]] +[[what_is_git_section]] === What is Git? So, what is Git in a nutshell? diff --git a/book/03-git-branching/sections/nutshell.asc b/book/03-git-branching/sections/nutshell.asc index 3c668cc7a..43461b17f 100644 --- 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 <>, Git doesn't store data as a series of changesets or differences, but instead as a series of _snapshots_. +As you may remember from <>, 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 <>), 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 <>), 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] ----