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

Question about git log --merge option

From
Andrey Hsiao <andreyhsiao@gmail.com>
Date
Apr 13, 2016, 16:53 UTC
Message-ID
<CAArk4YMOkd3dEn-09-LMO7zf=X3iJqXUjCS0YNN5v4h=PjrTLg@mail.gmail.com>
Dear list:
Just encountered the --merge option for git log.
In the man page, it has the following explanation:
- After a failed merge, show refs that touch files having a conflict
and don't exist on all heads to merge.
I tried this option and get below results:
1. For a failed merge (with conflicts), if the conflicted file does
not exist on either side of the merge, the --merge option will return
the log from the other side.
2. If the conflicted file exists on both sides of the merge, the
--merge option will return the latest change on either side. (i.e: git
log -1 -- conflict_file / git log -1 --merge -- conflict_file may
return different results, whichever changed the latest)

I'm not sure whether above behavior is the unexpected result (cannot find detailed explanation for --merge option online).

Thanks
Next: Junio C Hamano
Message 1 of 3 in “Question about git log --merge option”
  1. Andrey HsiaoApr 13, 2016
  2. Junio C HamanoApr 13, 2016
  3. Andrey HsiaoApr 14, 2016

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.