From: Hilco Wijbenga <hilco.wijbenga@gmail.com>
Date: Fri, 22 Jun 2012 22:33:05 GMT
Subject: Re: Master and origin/master diverged
Message-ID: <CAE1pOi0zkDa=scowaaT=VdLjdYL2UPW++e0ZXLrzU6kncX8-ow@mail.gmail.com>
In-Reply-To: <CABURp0rhVi+pi4YjCfQqMpcjV2rYKQHPQ3QUZ49h0gjERAS4Qg@mail.gmail.com>

On 22 June 2012 15:10, Phil Hord <phil.hord@gmail.com> wrote:
> On Fri, Jun 22, 2012 at 4:14 PM, Hilco Wijbenga
> <hilco.wijbenga@gmail.com> 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).