From: Junio C Hamano Date: Mon, 22 May 2006 00:35:46 GMT Subject: Re: totorial-2 Re: (unknown) Message-ID: <7vfyj2hp5p.fsf_-_@assigned-by-dhcp.cox.net> In-Reply-To: <1148255528.61d5d241.2@fieldses.org> "J. Bruce Fields" writes: > From nobody Mon Sep 17 00:00:00 2001 > From: J. Bruce Fields > Date: Sun, 21 May 2006 19:49:34 -0400 > Subject: [PATCH 3/3] tutorial: add discussion of index file, object database Thanks. I like the changes to tutorial.txt too btw. > @@ -0,0 +1,391 @@ > +A tutorial introduction to git: part two >... > +and the contents of these files is just the compressed data plus a > +header identifying their length and their type. The type is either a > +blob, a tree, a commit, or a tag. We've seen a blob and a tree now, > +so next we should look at a commit. >... > +Besides blobs, trees, and commits, the only remaining type of object > +is a "tag", which we won't discuss here; refer to gitlink:git-tag[1] > +for details. We have created a tag in tutorial#1, so it _might_ make sense to just tell the user to cat-file it. > +------------------------------------------------ > +$ git diff > +--- a/file.txt > ++++ b/file.txt > +@@ -1 +1,2 @@ > + hello world! > + +hello world, again > +$ git update-index file.txt > +$ git diff > +------------------------------------------------ Is the second line of the diff " +" intentional? The same comment to the example that immediately follows this part.