Merge branch 'sb/maint-rebase' into maint

diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 1dfc01e8f009968ef5d6118bffed7818e736576c..d0a462ff8b3760a4a21d9a72339a02891a5b4aef 100644 (file)
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -188,6 +188,8 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
        mark_object(&commit->object);
        if (!is_encoding_utf8(encoding))
                reencoded = reencode_string(message, "UTF-8", encoding);
+       if (!commit->parents)
+               printf("reset %s\n", (const char*)commit->util);
        printf("commit %s\nmark :%d\n%.*s\n%.*s\ndata %u\n%s",
               (const char *)commit->util, last_idnum,
               (int)(author_end - author), author,