Use 'fast-forward' all over the place

diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c
index b771fe9b20f4c4d6e19289f428442d489aba6896..fea8fcdd8aa27e3210bf08d48cb2e9275f4def97 100644 (file)
--- a/builtin-receive-pack.c
+++ b/builtin-receive-pack.c
@@ -329,9 +329,9 @@ static const char *update(struct command *cmd)
                                break;
                free_commit_list(bases);
                if (!ent) {
-                       error("denying non-fast forward %s"
+                       error("denying non-fast-forward %s"
                              " (you should pull first)", name);
-                       return "non-fast forward";
+                       return "non-fast-forward";
                }
        }
        if (run_update_hook(cmd)) {