Use 'fast-forward' all over the place

It's a compound word.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras
2009-10-24 11:31:32 +03:00
committed by Junio C Hamano
parent 78d553b7d7
commit a75d7b5409
35 changed files with 71 additions and 71 deletions

View File

@ -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)) {