rebase: Support preserving merges in non-interactive mode

diff --git a/builtin-log.c b/builtin-log.c
index 081e660f6ff3cea2171e0ce30bdef2c347293863..fc5e4da822c470fdb2fb4738874a56e0103a2013 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -817,7 +817,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                        committer = git_committer_info(IDENT_ERROR_ON_NO_NAME);
                        endpos = strchr(committer, '>');
                        if (!endpos)
-                               die("bogos committer info %s\n", committer);
+                               die("bogus committer info %s\n", committer);
                        add_signoff = xmemdupz(committer, endpos - committer + 1);
                }
                else if (!strcmp(argv[i], "--attach")) {