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, 13:24 UTC
Message-ID
<CAO1Khk_r5eubm6M815FCxXLRpm-zPhzfFasug497saev8o-qeQ@mail.gmail.com>
In-Reply-To
<1353935441-ner-9639@calvin>

On Mon, Nov 26, 2012 at 2:10 PM, Tomas Carnecky <tomas.carnecky@gmail.com> wrote:

Show 5 quoted lines
> On Mon, 26 Nov 2012 14:06:09 +0100, Igor Lautar <igor.lautar@gmail.com> wrote:
>> git log <file modified by commit>
>>  - commit NOT shown in file history any more and file does not have this change
>
> does `git log --full-history <file modified by commit>` show the commit?
Indeed it does.

Did the merge with verbosity set to 5. It says the commit I'm merging in is virtual (probably as it is a merge commit in itself?).

Why would commit be left behind after merge? What kind of history triggers this scenario? Just trying to understand reasoning as its counter-intuitive to what I know now. This may affect our workflow (ie., change it so we avoid it happening).

Previous: Igor Lautar
Message 13 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.