diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:01 -0800 |
| commit | 67bc7407211d26de518811dafc2c1cf2e6124709 (patch) | |
| tree | 6fffca8665145d1f3164abce6d980f8c537e1343 /builtin-log.c | |
| parent | f986eecde1e59fc4cc2b0b761ffc0fe563dad267 (diff) | |
| parent | 7dccadf363f9d9ff564ad34117266b2d557a2bc8 (diff) | |
| download | git-67bc7407211d26de518811dafc2c1cf2e6124709.tar.gz | |
Merge branch 'jc/maint-limit-note-output'
* jc/maint-limit-note-output:
Fix "log --oneline" not to show notes
Fix "log" family not to be too agressive about showing notes
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-log.c b/builtin-log.c index 41b6df490f..8d16832f7e 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -58,6 +58,9 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, usage(builtin_log_usage); argc = setup_revisions(argc, argv, rev, "HEAD"); + if (!rev->show_notes_given && !rev->pretty_given) + rev->show_notes = 1; + if (rev->diffopt.pickaxe || rev->diffopt.filter) rev->always_show_header = 0; if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) { |