Re: Master and origin/master diverged

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 22 June 2012 15:10, Phil Hord <phil.hord@xxxxxxxxx> wrote:
> On Fri, Jun 22, 2012 at 4:14 PM, Hilco Wijbenga
> <hilco.wijbenga@xxxxxxxxx> wrote:
>>> You can also compare the commits to see what the differences are.
>>> This may trigger  the developer's memory about how it might have
>>> happened.
>>
>> The only differences seem to be the SHA-1s.
>
> Can you tell me which SHA-1s they are?  It will be easier for me to
> guess at the reflog contents, then.

You mean which SHA-1s in the reflog? It's the ones listed as @{"18
hours ago"}: rebase: ... Sorry, I should have pointed that out.

The reflog lists the SHA-1s that the dev had and that were pushed to
origin/master (so B', C', and D' in my original description). The ones
that were on origin/master originally (and are/were on my local
master) are different (B, C, and D).
--
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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]