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

Re: How to find and analyze bad merges?

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Feb 2, 2012, 12:03 UTC
Message-ID
<20120202120340.GA25190@burratino>
In-Reply-To
<CAFfmPPMc1V97OPHyrZp+p4YUek1c6fCncyj0s1YU9xjxQBCsDA@mail.gmail.com>
David Barr wrote:
> Do the -c --cc or -m flags for git log help in this case?
> They alter the way merge diffs are presented, as described under Diff Formatting
> in the git-log(1)  man page.

I suspect Norbert was running into history simplification, so the --full-history flag would be the relevant one.

See the thread [1] for a few relevant side-notes.
[1] http://thread.gmane.org/gmane.comp.version-control.git/188904
Previous: David BarrNext: norbert.nemec
Message 8 of 11 in “How to find and analyze bad merges?”
  1. norbert.nemecFeb 2, 2012
  2. Junio C HamanoFeb 2, 2012
  3. norbert.nemecFeb 2, 2012
  4. Junio C HamanoFeb 2, 2012
  5. norbert.nemecFeb 2, 2012
  6. Norbert NemecFeb 2, 2012
  7. David BarrFeb 2, 2012
  8. Jonathan NiederFeb 2, 2012
  9. norbert.nemecFeb 2, 2012
  10. Neal GroothuisFeb 2, 2012
  11. norbert.nemecFeb 2, 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.