git log --graph: print '*' for all commits, including merges

[git.git] / graph.c

diff --git a/graph.c b/graph.c
index 283b13792d943e19ba2b68cf9705ada03dbadc94..e2633f8376eb7b12706dcd4c698e2b3f6be2b433 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -679,20 +679,6 @@ static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb)
                return;
        }
 
-       /*
-        * 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
         */