summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-13 14:12:36 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-13 14:12:36 -0700
commitcafef3d7ad3ed58d9c976bdeb604cff6b4c1f82b (patch)
treef16d708c5ce5391423a4747535bac46bbfb1c860 /commit.h
parent7c137bb5316fbd82e816c2dabebc1d347261c93e (diff)
parent915c96df3822f968332f6bf3642e5195b52201c9 (diff)
downloadgit-cafef3d7ad3ed58d9c976bdeb604cff6b4c1f82b.tar.gz
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 'commit.h')
-rw-r--r--commit.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 5d58be0017..b06db4d5d9 100644
--- a/commit.h
+++ b/commit.h
@@ -147,6 +147,7 @@ struct pretty_print_context {
int preserve_subject;
struct date_mode date_mode;
unsigned date_mode_explicit:1;
+ int expand_tabs_in_log;
int need_8bit_cte;
char *notes_message;
struct reflog_walk_info *reflog_info;