All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shawn Pearce <spearce@spearce.org>
To: Junio C Hamano <junkio@cox.net>
Cc: Carl Worth <cworth@cworth.org>,
	Peter Baumann <Peter.B.Baumann@stud.informatik.uni-erlangen.de>,
	git@vger.kernel.org
Subject: Re: Separating "add path to index" from "update content in index"
Date: Fri, 22 Dec 2006 00:21:56 -0500	[thread overview]
Message-ID: <20061222052156.GA15548@spearce.org> (raw)
In-Reply-To: <7vfyb87bxg.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> wrote:
> And it is not just limited to adding the contents of a path that
> happened to be told git for the first time.  Adding the contents
> of a path that was known to git also happens only when it is in
> a presentable good state.  So running "git diff" and not seeing
> what I added before is a GOOD THING.

Yes!

Sadly it has taken me 12 months of working with Git to get
comfortable enough with that concept.

Actually it clicked once I realized that 'update-index' was actually
creating the blobs in the ODB and not 'write-tree'.  Prior to that
"click" going off in my grey matter I always felt that Git screwed
up when I did:

	$ vi foo.c
	$ git update-index foo.c
	$ git diff
	# what the ? where are my changes?

I now make quite heavy use of the index even when hacking on code,
and not just during merges.  But I wasn't like that just 5 months
ago...

-- 
Shawn.

  reply	other threads:[~2006-12-22  5:22 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-19 20:33 GIT - error: no such remote ref refs/heads/TestBranch Sean Kelley
2006-12-19 22:06 ` Junio C Hamano
2006-12-20 22:31   ` Carl Worth
2006-12-20 22:36     ` Junio C Hamano
2006-12-20 22:57       ` Carl Worth
2006-12-20 23:36         ` Junio C Hamano
2006-12-21  6:55           ` Carl Worth
2006-12-21 10:49             ` Peter Baumann
2006-12-22  0:52               ` Junio C Hamano
2006-12-22  2:32                 ` Separating "add path to index" from "update content in index" Carl Worth
2006-12-22  3:06                   ` Sean
2006-12-22  5:06                   ` Nicolas Pitre
2006-12-22 21:57                     ` Carl Worth
2006-12-23  5:27                       ` Nicolas Pitre
2006-12-24 21:38                         ` Daniel Barkalow
2006-12-22  5:10                   ` Junio C Hamano
2006-12-22  5:21                     ` Shawn Pearce [this message]
2006-12-22  8:24                     ` Jakub Narebski
2006-12-22 16:18                     ` Carl Worth
2006-12-22 17:28                       ` Nicolas Pitre
2006-12-22 16:55                     ` Carl Worth
2006-12-23  2:56                     ` Daniel Barkalow

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=20061222052156.GA15548@spearce.org \
    --to=spearce@spearce.org \
    --cc=Peter.B.Baumann@stud.informatik.uni-erlangen.de \
    --cc=cworth@cworth.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.