> So supposedly you'd need > > $ git diff :2:adobepass.py :3:adobepass.py
Thank you! Would you believe I tried abodepass.py:1, and 1: adobepass.py, but did not realize that I needed :x: prefix? (I also thought that "0" was the common, and "1" and "2" were the two sides.) === Next question, on that merge_head diff. Attempting to ask for the difference before doing a merge (I'm trying to rebuild a fork of youtube-dl with several pull requests and patches) would show an insanely large number of diffs (everything that has changed from a patch based on a months-old master), while the patch itself would only conflict in one file. My problem is that most of the hunks for that file apply without problem; in order to know how to resolve the changes, I need to know what's actually changing in that file. How do I ask for a diff of "This is what would be applied if you tried to merge", rather than "this is everything that differs over the course of months"? Basically, a given change would be adding unconflicted stuff here and there, and then adding something to a commonly edited area. Fixing that common area requires knowing what's what. I have three-way diffmarks enabled (not sure what it's official name is), so I see a very old common, and two large sets of changes. At least one of the patches that I was trying to add in seems to be completely obsoleted by a later change. (Aka: What I have runs, but I don't know if it will work correctly in all cases, or if I messed something up in the combination.) --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
