Junio C Hamano <junkio@cox.net> writes: > Linus Torvalds <torvalds@osdl.org> writes: > >> What does "git-diff-files" do? Just output a lot of nasty "unmerged" >> messages? > > That was not what was unpleasant. What was unpleasant was those > "unmerged" messages were buried under heap of normal diffs, > showing the successfully merged entries as the result of merge. Correction. The above is a faulty memory, and does not happen, with or without your "stage0 or stage2" patch. Cleanly merged paths are written out to working tree and collapsed to stage0 in the index, so diff-files wouldn't have shown them at all. Sorry about the confused statement. What I saw was my local modifications on the paths unrelated to the merge. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Wed Nov 30 20:44:11 2005
This archive was generated by hypermail 2.1.8 : 2005-11-30 20:44:17 EST