diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-05 10:59:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-05 10:59:05 -0800 |
| commit | b401a12a2c49d3f3e81e356782d9ca49aaa97faa (patch) | |
| tree | 3c08d47265838d7b13ae8e2649835159077a6f0c /builtin-log.c | |
| parent | 3325cea0f7ef7355f6806b2fc88acdb2e27785ac (diff) | |
| parent | 7dccadf363f9d9ff564ad34117266b2d557a2bc8 (diff) | |
| download | git-b401a12a2c49d3f3e81e356782d9ca49aaa97faa.tar.gz | |
Merge branch 'jc/maint-limit-note-output' into maint
* 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 1766349550..2cb292fa72 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)) { |