On Tue, Oct 31, 2017 at 08:07:53PM -0700, Michael wrote:
[...]
> keybounceMBP:extractor michael$ git diff head^1 head^2 adobepass.py
[...]
…and while we're on it, can I heartily recommend you to unlearn this
habit of lowercasing the name of the ref "HEAD"?
The problem with it is that the fact it
From: "Konstantin Khomoutov"
You understand the man page correcly but are you sure HEAD^1 and HEAD^2
is really what you want? To cite the manual page:
| A suffix ^ to a revision parameter means the first parent of that
| commit object. ^ means the th parent.
=
As an aside: I commonly get c
> 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,
> 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,
> 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 Tue, Oct 31, 2017 at 08:07:53PM -0700, Michael 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?
On 2017-10-31, at 7:53 PM, Michael 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 quest