Re: Wine + GIT

Jeff Garzik [off-list ref] writes:

5) never ever do
	git-checkout -f HEAD

HEAD should always be a symlink.  'git checkout -f master' is probably 
what you want.

Correct.  "git checkout -f HEAD" is a redundant way to say
"I screwed up and would want to revert the mess in my working
tree to my branch head".  You do not need to say HEAD; "git
checkout -f" (or "git reset --hard" if you really want to clean
things up) would do.

6) For merges with hand-merged conflicts, I could have sworn that either 
a "git commit -a" or 'git-update-index' + 'git commit' was required. 
Maybe I'm wrong, or that has changed?

That has not changed.  With the recent 0.99.9l change, I suspect
that the example on the wiki page (without update-index) would
fail to commit -- the index is now left unmerged after a failed
automerge.

The paragraph "Once you have finished editting [sic]..." needs
to be followed by:

	git-update-index those paths you hand corrected
        git-commit