Re: [RFC] git-add update with all-0 object

From: Linus Torvalds <torvalds@osdl.org>
Date: Dec 1, 2006, 07:10 UTC
Message-ID: <Pine.LNX.4.64.0611302306120.3695@woody.osdl.org>
In-Reply-To: <20061201045727.GA22622@thunk.org>

On Thu, 30 Nov 2006, Theodore Tso wrote:

>
> By the way, after thinking about this for a while, part of the problem
> is that the name "index" really sucks.

Hey, it was originally called "cache".

I don't care _what_ it's called, I just want people knowing about it, because hiding it will just cripple git (ie at the very least, when you hit a merge conflict, you really do want to to understand it if you ever want to go the the "next level").

If people are more comfortable just calling it the "staging area", and talking about it in those terms, I'll be happy.

Show 8 quoted lines

> Put another way, the reason why I think people are liking the whole
> "git add" and "git rm" suggestion is that it's a nice middle ground
> between the "hide the index" and the "shove the index in the user's
> face" approaches.  It's not that we are hiding the fact that there is
> this thing with the horribly chosen name "index", but instead we talk
> about this concept of a staging area and we don't dwell on things like
> the fact that it is a binary file which stores an efficient
> representation of a virtual directory.... blah blah blah.

Yes.

And even "git diff" isn't really a problem once you understand the staging area. If people feel worried, let them use "git diff HEAD". You won't need to use git for _that_ long until you realize that since the staging area is going to match the HEAD under normal circumstances (and when it doesn't, you actually tend to prefer to get the diff against the staging area _anyway_), you'll find people just starting to use "git diff" and not worry about it.