Re: Meaning of two commit-ish hash in git diff

2017-10-31 Thread Junio C Hamano
Yubin Ruan writes: >>> IOW, if you have the contents of the blob whose object name is >>> f8886b4, by applying this patch, you will get a blob whose object >>> name is a1c96df. >>> >>> The information is used by "git am -3" when the patch does not apply >>> cleanly to

Re: Meaning of two commit-ish hash in git diff

2017-10-31 Thread Yubin Ruan
Thanks Philip, On 11/01/2017 08:27 AM, Philip Oakley wrote: > Yubin , > > From: "Junio C Hamano" >> Yubin Ruan writes: >> >>> diff --git a/path/somefile b/path/somefile >>> index f8886b4..a1c96df 100644 >>> --- a/path/somefile >>> +++ b/path/somefile

Re: Meaning of two commit-ish hash in git diff

2017-10-31 Thread Philip Oakley
Yubin , From: "Junio C Hamano" Yubin Ruan writes: diff --git a/path/somefile b/path/somefile index f8886b4..a1c96df 100644 --- a/path/somefile +++ b/path/somefile This is output by a `git diff` between two adjacent commits but they are not any

Re: Meaning of two commit-ish hash in git diff

2017-10-30 Thread Junio C Hamano
Yubin Ruan writes: > diff --git a/path/somefile b/path/somefile > index f8886b4..a1c96df 100644 > --- a/path/somefile > +++ b/path/somefile > > > This is output by a `git diff` between two adjacent commits but they are > not any commit hash. I grep through the whole