diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-20 06:15:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-20 06:15:44 (GMT) |
| commit | 34a5d35bbd6164cfbe08f5f14e359867ce80955b (patch) | |
| tree | 34021c00b8428d015583c7e9fffc5b8c1d37963e /builtin-log.c | |
| parent | 05e8b3d6f43bd28aef85ec6e7658536510d6f959 (diff) | |
| parent | cc185a6a8ac24737a26ec4b40cc401c2db8b2e97 (diff) | |
| download | git-34a5d35bbd6164cfbe08f5f14e359867ce80955b.zip git-34a5d35bbd6164cfbe08f5f14e359867ce80955b.tar.gz git-34a5d35bbd6164cfbe08f5f14e359867ce80955b.tar.bz2 | |
Merge branch 'maint'
* maint:
Start draft release notes for 1.6.0.3
git-repack uses --no-repack-object, not --no-repack-delta.
Typo "bogos" in format-patch error message.
builtin-clone: fix typo
Bust the ghost of long-defunct diffcore-pathspec.
completion: git commit should list --interactive
Conflicts:
RelNotes
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c index 081e660..fc5e4da 100644 --- 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")) { |