From 03300c0ac0dfd6098ff65cff518bfffb05ae4194 Mon Sep 17 00:00:00 2001 From: Adam Simpkins Date: Thu, 5 Jun 2008 02:28:13 -0700 Subject: [PATCH] git log --graph: print '*' for all commits, including merges Previously, merge commits were printed with 'M' instead of '*'. This had the potential to confuse users when not all parents of the merge commit were included in the log output. As Junio has pointed out, merge commits can almost always be easily identified from the log message, anyway. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano --- graph.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/graph.c b/graph.c index 283b13792d..e2633f8376 100644 --- a/graph.c +++ b/graph.c @@ -680,20 +680,6 @@ static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb) } /* - * Print 'M' for merge commits - * - * Note that we don't check graph->num_parents to determine if the - * commit is a merge, since that only tracks the number of - * "interesting" parents. We want to print 'M' for merge commits - * even if they have less than 2 interesting parents. - */ - if (graph->commit->parents != NULL && - graph->commit->parents->next != NULL) { - strbuf_addch(sb, 'M'); - return; - } - - /* * Print '*' in all other cases */ strbuf_addch(sb, '*'); -- 2.11.4.GIT