git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: git@vger.kernel.org
Subject: Re: totorial-2 Re: (unknown)
Date: Sun, 21 May 2006 17:35:46 -0700	[thread overview]
Message-ID: <7vfyj2hp5p.fsf_-_@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <1148255528.61d5d241.2@fieldses.org> (J. Bruce Fields's message of "Sun, 21 May 2006 19:53:28 -0400")

"J. Bruce Fields" <bfields@fieldses.org> writes:

> From nobody Mon Sep 17 00:00:00 2001
> From: J. Bruce Fields <bfields@citi.umich.edu>
> 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.

  reply	other threads:[~2006-05-22  0:36 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-05-21 23:53 (unknown) J. Bruce Fields
2006-05-21 23:53 ` (unknown) J. Bruce Fields
2006-05-21 23:53   ` (unknown) J. Bruce Fields
2006-05-22  0:35     ` Junio C Hamano [this message]
2006-05-22  1:25       ` totorial-2 (unknown) J. Bruce Fields
2006-05-22 15:27     ` [PATCH 3/3] tutorial: add discussion of index file, object database Jakub Narebski
2006-05-22  8:23   ` [PATCH 2/3] tutorial: expanded discussion of commit history Jakub Narebski
2006-05-22  8:45     ` Junio C Hamano
2006-05-22  9:01       ` Jakub Narebski
2006-05-22 14:18         ` J. Bruce Fields
2006-05-21 23:55 ` your mail J. Bruce Fields
2006-05-22  0:16   ` Junio C Hamano
2006-05-22  1:33     ` J. Bruce Fields
2006-05-22 10:09 ` [PATCH] git help: remove whatchanged from list of common commands Martin Waitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vfyj2hp5p.fsf_-_@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=bfields@fieldses.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).