diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-04-19 21:10:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-19 21:10:54 -0700 |
| commit | d52301630f05c95a9bd0205bc36289ce8bab9211 (patch) | |
| tree | ceb520c609909451099335956937837f7a1b7e8e /builtin-log.c | |
| parent | Merge branch 'jk/remote-default-show' (diff) | |
| parent | log: teach "terminator" vs "separator" mode to "--pretty=format" (diff) | |
| download | tgif-d52301630f05c95a9bd0205bc36289ce8bab9211.tar.xz | |
Merge branch 'jc/terminator-separator'
* jc/terminator-separator:
log: teach "terminator" vs "separator" mode to "--pretty=format"
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c index 5c00725f03..1670d0b334 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -56,7 +56,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, rev->abbrev = DEFAULT_ABBREV; rev->commit_format = CMIT_FMT_DEFAULT; if (fmt_pretty) - rev->commit_format = get_commit_format(fmt_pretty); + get_commit_format(fmt_pretty, rev); rev->verbose_header = 1; DIFF_OPT_SET(&rev->diffopt, RECURSIVE); rev->show_root_diff = default_show_root; @@ -400,6 +400,7 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix) * allow us to set a different default. */ rev.commit_format = CMIT_FMT_ONELINE; + rev.use_terminator = 1; rev.always_show_header = 1; /* |