Re: totorial-2 Re: (unknown)

From: J. Bruce Fields <bfields@fieldses.org>
Date: May 22, 2006, 01:25 UTC
Message-ID: <20060522012519.GB4818@fieldses.org>
In-Reply-To: <7vfyj2hp5p.fsf_-_@assigned-by-dhcp.cox.net>

On Sun, May 21, 2006 at 05:35:46PM -0700, Junio C Hamano wrote:

Show 7 quoted lines

> "J. Bruce Fields" <bfields@fieldses.org> writes:
> > +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.

The example in tutorial.txt is a "lightweight" tag.

The original tutorial.txt (unlike this sequel) doesn't actually try to stick to a consistent example throughout, so it's awkward to refer back. Probably something to fix some day....

Show 14 quoted lines

> 
> > +------------------------------------------------
> > +$ 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.

Oops, no--those look like cut'n'paste errors. Would you like a revised patch?--b.