On Fri, 13 Jul 2007, Paul Mackerras wrote: > > I should add that I'm sure that gitk won't yet do the right thing if > there are files in the index at other than stage 0, or if the local > changes are the result of an incomplete merge. (In the latter case I > suppose one or other of the fake commits should have multiple parents, > but I don't have the infrastructure to add fake commits with multiple > parents yet.) That would be beautiful to see, indeed, when you're in the middle of a merge. "gitk --merge" already does most of it, but actually seeing the diff of the currently merged stuff would be pretty darn cool. Linus - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
