Grammar fix for "git merge" man page

diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index cdb7df5efeec9bbe6ec4ef4ab380403ea662bb12..34a419c38e15998e82c9daf5627154d491e1af04 100644 (file)
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -221,7 +221,8 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
        if (message)
                message += 2;
 
-       if (commit->parents) {
+       if (commit->parents &&
+           get_object_mark(&commit->parents->item->object) != 0) {
                parse_commit(commit->parents->item);
                diff_tree_sha1(commit->parents->item->tree->object.sha1,
                               commit->tree->object.sha1, "", &rev->diffopt);
@@ -497,6 +498,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
+       if (argc == 1)
+               usage_with_options (fast_export_usage, options);
+
        /* we handle encodings */
        git_config(git_default_config, NULL);