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

[PATCH 0/1] graph API: always print 'M' for merge commits

From
Adam Simpkins <adam@adamsimpkins.net>
Date
May 24, 2008, 20:52 UTC
Message-ID
<1211662321-28846-1-git-send-email-adam@adamsimpkins.net>
In-Reply-To
<20080524182530.GB2997@mithlond.arda.local>
On Sat, May 24, 2008 at 09:25:30PM +0300, Teemu Likonen wrote:
Show 9 quoted lines
> 
> I'd rather show merge commits always with M. They are still conceptually
> merges even if the current log view shows only one parent. This patch
> changes symbols * and M to be visual symbols, not logical symbols which
> I'd prefer.
> 
> For example user may be interested in finding certain merge but chooses
> to limit the output with a commit range. It helps if user can always
> trust the symbols * and M to have this conceptual difference.

Okay. Here's a simple patch to restore the behavior of always printing 'M' for merge commits, even if less than 2 parents are shown in the graph.

Adam Simpkins (1):
  graph API: always print 'M' for merge commits
 graph.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
Previous: Teemu LikonenNext: Adam Simpkins
Message 9 of 15 in “bug in "git log --graph" at the tail end?”
  1. Junio C HamanoMay 23, 2008
  2. Reece DunnMay 23, 2008
  3. Adam SimpkinsMay 24, 2008
  4. Junio C HamanoMay 24, 2008
  5. 0/2 fix "log --graph" issues with uninteresting parentsAdam Simpkins, May 24, 2008
  6. 1/2 graph API: fix graph mis-alignment after uninteresting commitsAdam Simpkins, May 24, 2008
  7. 2/2 graph API: don't print branch lines for uninteresting merge parentsAdam Simpkins, May 24, 2008
  8. Teemu LikonenMay 24, 2008
  9. 0/1 graph API: always print 'M' for merge commitsAdam Simpkins, May 24, 2008
  10. 1/1 graph API: always print 'M' for merge commitsAdam Simpkins, May 24, 2008
  11. Adam SimpkinsMay 24, 2008
  12. Junio C HamanoMay 25, 2008
  13. Teemu LikonenMay 25, 2008
  14. Adam SimpkinsMay 25, 2008
  15. Adam SimpkinsMay 24, 2008

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.