Merge branch 'hw/doc-in-header'

[thirdparty/git.git] / graph.c

diff --git a/graph.c b/graph.c
index e3fd0ea5f806a2598800041e97f049b2e5ba9ae3..66ae18add834e7a74cc68692947a8a464b6530cc 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -34,6 +34,7 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb);
  * handle directly. It is assumed that this is the same file handle as the
  * file specified by the graph diff options. This is necessary so that
  * graph_show_strbuf can be called even with a NULL graph.
+ * If a NULL graph is supplied, the strbuf is printed as-is.
  */
 static void graph_show_strbuf(struct git_graph *graph,
                              FILE *file,
@@ -218,7 +219,7 @@ struct git_graph {
        int merge_layout;
        /*
         * The number of columns added to the graph by the current commit. For
-        * 2-way and octopus merges, this is is usually one less than the
+        * 2-way and octopus merges, this is usually one less than the
         * number of parents:
         *
         *              | | |                   | |    \