git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Master and origin/master diverged

From
HWHilco Wijbenga <hilco.wijbenga@gmail.com>
Date
Jun 22, 2012, 22:33 UTC
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:
Show 10 quoted lines
> 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).

Previous: Phil HordNext: Neal Kreitzinger
Message 5 of 13 in “Master and origin/master diverged”
  1. Hilco WijbengaJun 22, 2012
  2. Phil HordJun 22, 2012
  3. Hilco WijbengaJun 22, 2012
  4. Phil HordJun 22, 2012
  5. Hilco WijbengaJun 22, 2012
  6. Neal KreitzingerJun 22, 2012
  7. Hilco WijbengaJun 22, 2012
  8. Neal KreitzingerJun 22, 2012
  9. Hilco WijbengaJun 26, 2012
  10. Neal KreitzingerJun 27, 2012
  11. Junio C HamanoJun 22, 2012
  12. Hilco WijbengaJun 26, 2012
  13. Junio C HamanoJun 26, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.