Re: [Census] So who uses git?

From: J. Bruce Fields <bfields@fieldses.org>
Date: Jan 31, 2006, 18:12 UTC
Message-ID: <20060131181248.GE11955@fieldses.org>
In-Reply-To: <Pine.LNX.4.64.0601310926330.7301@g5.osdl.org>

On Tue, Jan 31, 2006 at 09:30:48AM -0800, Linus Torvalds wrote:

Show 12 quoted lines

> I really think you should explain it one of two ways:
> 
>  - ignore it. Never _ever_ use git-update-index directly, and don't tell 
>    people about use individual filenames to git-commit. Maybe even add 
>    "-a" by default to the git-commit flags as a special installation 
>    addition.
> 
>  - talk about the index, and revel in it as a way to explain the staging 
>    area. This is what the old tutorial.txt did before it got simplified.
> 
> The "ignore the index" approach is the simple one to explain. It's 
> strictly less powerful, but hey, what else is new?

Yeah, I do wonder what's likely to be the best approach for most users. My goal with the new tutorial was to get a reader doing something fun and useful as quickly as possible. So it just refers elsewhere for any discussion of the index file or SHA1 names. But probably everyone needs to pick up that stuff eventually anyway, and maybe it's better to get to it a little sooner, I dunno.

Besides the git-add/git-commit thing, the other thing that caught me by suprise was the behaviour of git reset. I expected there to be an "inverse" to git commit -a, meaning that

	1) the sequence
		git reset HEAD^
		git commit -a
	   would be a no-op, in the sense that the new commit would
	   get the same changes as the old one, and
	2) the sequence
		git commit -a
		git reset HEAD^
	   would be a no-op, in the sense that "git diff" would report
	   the same diff before and after.

But there isn't, and explaining how --soft and --mixed actually work requires referring to the index file.

Is that something that can be fixed in the tools or does the user fundamentally need to know about the index file to do this kind of stuff?

--b.