On 2017-10-31, at 7:53 PM, Michael <keybou...@gmail.com> wrote:
> How do I get git diff to show me the difference between two different
> versions of one file?
> I can say git diff tree-1 tree-2
> I can say git diff file1
> How do I ask for file1 in tree-1 versus file1 in tree-2?
Ok, perhaps a better question: Why isn't this doing what I expect?
keybounceMBP:extractor michael$ git status
On branch new
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
(use "git add <file>..." to mark resolution)
both modified: adobepass.py
keybounceMBP:extractor michael$ git diff head^1 head^2 adobepass.py
If I understood the man page correctly, git diff tree-1 tree-2 path should work.
But that's not what I'm getting from that.
> Entertaining minecraft videos
Entertaining minecraft videos
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
For more options, visit https://groups.google.com/d/optout.