Re: git-name-rev off-by-one bug

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Nov 30, 2005, 18:11 UTC
Message-ID: <Pine.LNX.4.64.0511301302310.25300@iabervon.org>
In-Reply-To: <Pine.LNX.4.64.0511291742000.3135@g5.osdl.org>

On Tue, 29 Nov 2005, Linus Torvalds wrote:

> If we left things in the index in an unmerged state, we'd be guaranteed to 
> either _fail_ that git commit unless somebody has done the 
> git-update-index (or names the files specifically on the commit command 
> line, which will do it for you).

At this point, we could have a "git-merged-by-hand" script that would take filenames, check that they're unmerged now, and, if so, call git-update-index for them. And it could have a -a to do all of the unmerged entries (i.e., "I'm done merging by hand"), and maybe also have a flag to git-commit that does this, so you can say, "Commit the merge I did by hand, whatever filenames it used, but not any other changes I may have had beforehand."

The "merged-by-hand" script would probably be a sensible place to complain about leftover conflict markers (unless you force it).

	-Daniel
*This .sig left intentionally blank*