Re: [PATCH] Documentation/tutorial: misc updates
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:47
"Santi Béjar" [off-list ref] writes:
On 1/3/07, Horst H. von Brand [off-list ref] wrote:quoted
Santi Béjar [off-list ref] wrote:quoted
-Every commit has at least one "parent" commit, which points to the -previous state of the project: +Every commit has at least one "parent" commit (except the first), +which points to the previous state of the project:And how can it have more than one parent? If you mention it, better come clean about merges (can be explained in detail later).I have not mentined it, I've just added the exception that the firt/root commits have zero parents.
Well, it does not matter who originally is at fault ;-). Let's just do this.
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index f0a5526..0cc234f 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt@@ -400,7 +400,7 @@ $ git show HEAD # the tip of the current branch $ git show experimental # the tip of the "experimental" branch ------------------------------------- -Every commit has at least one "parent" commit (except the first), +Every commit usually has one "parent" commit which points to the previous state of the project: -------------------------------------
After this paragraph, we say "merge has more than one", so it's all consistent and presented in the right order. By the time the reader starts wondering about the initial commit, we've shown the use of HEAD^^^^ and HEAD~$n enough that the reader can experiment on his/her own.