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

Re: Lost changes after merge

From
Jeff King <peff@peff.net>
Date
Oct 29, 2018, 14:18 UTC
Message-ID
<20181029141804.GC17668@sigill.intra.peff.net>
In-Reply-To
<CAP1N1j7P83XVPx6dDGMSeRbwjdixAdBNZab=TP94=9LSfmsrRQ@mail.gmail.com>
On Mon, Oct 29, 2018 at 09:49:20AM +0100, Gray King wrote:
Show 8 quoted lines
> Hello,
> 
>   I have a very strange issue described below:
> 
> * Here is the tree before I merge via `git log --format="%h %p %d" -n
> 20 --all --graph`:
> 
> https://upaste.de/9Pe

FWIW, neither this nor the other paste link in your email seem to work for me (which makes it hard to comment on the rest of the email).

-Peff
Previous: Gray KingNext: Gray King
Message 3 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.