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

Re: Lost changes after merge

From
Rafael Ascensão <rafa.almas@gmail.com>
Date
Oct 30, 2018, 15:29 UTC
Message-ID
<20181030152929.uxxf3r6gsslr4vpp@rigel>
In-Reply-To
<CAP1N1j7AbiYLfe4EiFn-4zdBd-nD2paXx1hZhqiUCOq4iLh9zw@mail.gmail.com>
The commits you mentioned are not present on the new pastes.
On Tue, Oct 30, 2018 at 03:46:28AM +0100, Gray King wrote:
> Sorry, seems the link has been expired, here is the new one:
> * Before merge run `git log --format="%h %p %d" -n 20 --all --graph`:
>

One thing I noticed, is that you're using %p with --graph. And --graph enables parent rewriting. Which may surprise you if you don't know what it does.

But apart from that, and assuming you only did `git merge f087081868` everything looks normal between those two pastes.

Cheers, Rafael Ascensão

Previous: Gray KingNext: Brandon McCaig
Message 5 of 6 in “Lost changes after merge”
  1. Gray KingOct 29, 2018
  2. Gray KingOct 29, 2018
  3. Jeff KingOct 29, 2018
  4. Gray KingOct 30, 2018
  5. Rafael AscensãoOct 30, 2018
  6. Brandon McCaigOct 31, 2018

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.