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

Re: commit gone after merge - how to debug?

From
ILIgor Lautar <igor.lautar@gmail.com>
Date
Nov 26, 2012, 14:23 UTC
Message-ID
<CAO1Khk_Czr9=1pECpFAkqfGaYz7qPSE1jvEtQ3u2HOASq+yMwQ@mail.gmail.com>
In-Reply-To
<vpqboekqwei.fsf@grenoble-inp.fr>

On Mon, Nov 26, 2012 at 3:19 PM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

> What about "git annotate <file> <merge-commit>^1"?
No change, line version goes back to when file was added.
> Was the merge completely automatic, or were there any conflict?

No conflicts at all. In fact, that particular file was not touched by one side of merge, only by another. It seems like git ignored the change, but still recorded history (shown only with --full-history).

Previous: Matthieu MoyNext: Matthieu Moy
Message 10 of 13 in “commit gone after merge - how to debug?”
  1. Igor LautarNov 26, 2012
  2. Tomas CarneckyNov 26, 2012
  3. Matthieu MoyNov 26, 2012
  4. Igor LautarNov 26, 2012
  5. Matthieu MoyNov 26, 2012
  6. Igor LautarNov 26, 2012
  7. Matthieu MoyNov 26, 2012
  8. Igor LautarNov 26, 2012
  9. Matthieu MoyNov 26, 2012
  10. Igor LautarNov 26, 2012
  11. Matthieu MoyNov 26, 2012
  12. Igor LautarNov 26, 2012
  13. Igor LautarNov 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.