diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 19:09:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 19:09:18 (GMT) |
| commit | b9575e78e504d0fed4747bb2325aa09e2626b6e9 (patch) | |
| tree | 1be92a68715d73560c3139b322bdcc019f3a49fc /builtin | |
| parent | 2177dc69cd693eeb52def931f41ad4f3a766846e (diff) | |
| parent | 01771a8e2b9f697d1ae4e3d20d9ab86a4aa9e633 (diff) | |
| download | git-b9575e78e504d0fed4747bb2325aa09e2626b6e9.zip git-b9575e78e504d0fed4747bb2325aa09e2626b6e9.tar.gz git-b9575e78e504d0fed4747bb2325aa09e2626b6e9.tar.bz2 | |
Merge branch 'jc/log-quiet-fix'
* jc/log-quiet-fix:
log: --quiet should serve as synonym to -s
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index 27849dc..224b167 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -107,6 +107,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, PARSE_OPT_KEEP_DASHDASH); argc = setup_revisions(argc, argv, rev, opt); + if (quiet) + rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT; /* Any arguments at this point are not recognized */ if (argc > 1) |