Merge branch 'maint' into bc/master-diff-hunk-header-fix

diff --git a/builtin-log.c b/builtin-log.c
index 1d3c5cbf580f3989d9605ed68f80beb050e19d39..d4aaddc9dbe2d401216ebf51a7097a7fa0f08387 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -844,7 +844,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")) {