On Sun, Jul 01, 2007 at 02:39:56PM -0700, Junio C Hamano wrote: > For paths that are cleanly merged with this three-way merge, > merge-recursive updates the working tree and the index. That > means if you do "git diff", you would not see the local changes > that were carried forward would not be visible, and you would > need "git diff HEAD" to view them. I found it confusing, and > that was the suggestion I sent was about. Nana's "3rd try", which > I applied and pushed to 'next', addresses this issue by running > "read-tree --reset $c_tree" (where $c_tree is the contents of > the index before replaying the stash). > > This is not ideal. We would want to see "git diff" for such a > path show difference similar to difference between I and W. Ah, I get it now. Thanks for the explanation. I see you gutted the confusing text from the manpage...I think what you have now is conceptually much simpler, and it won't bite anyone unless they are trying to do something clever with the index. In which case I hope they will be able to use the description of how the stash is stored to poke around. -Peff - 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
