diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:36 -0700 |
| commit | cafef3d7ad3ed58d9c976bdeb604cff6b4c1f82b (patch) | |
| tree | f16d708c5ce5391423a4747535bac46bbfb1c860 /log-tree.c | |
| parent | 7c137bb5316fbd82e816c2dabebc1d347261c93e (diff) | |
| parent | 915c96df3822f968332f6bf3642e5195b52201c9 (diff) | |
| download | git-cafef3d7ad3ed58d9c976bdeb604cff6b4c1f82b.tar.gz git-cafef3d7ad3ed58d9c976bdeb604cff6b4c1f82b.tar.xz | |
Merge branch 'lt/pretty-expand-tabs'
When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
originally intended. The command now expands tabs by default in
such a case, and allows the users to override it with a new option,
'--no-expand-tabs'.
* lt/pretty-expand-tabs:
pretty: test --expand-tabs
pretty: allow tweaking tabwidth in --expand-tabs
pretty: enable --expand-tabs by default for selected pretty formats
pretty: expand tabs in indented logs to make things line up properly
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c index 60f983934..78a5381d0 100644 --- a/log-tree.c +++ b/log-tree.c @@ -683,6 +683,7 @@ void show_log(struct rev_info *opt) ctx.fmt = opt->commit_format; ctx.mailmap = opt->mailmap; ctx.color = opt->diffopt.use_color; + ctx.expand_tabs_in_log = opt->expand_tabs_in_log; ctx.output_encoding = get_log_output_encoding(); if (opt->from_ident.mail_begin && opt->from_ident.name_begin) ctx.from_ident = &opt->from_ident; |