diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-03-29 15:49:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-30 12:39:29 -0700 |
| commit | 0893eec85fca0f76039a96cbbcd3592ff8571c24 (patch) | |
| tree | 2be9e1683a91699d45472fe1b0d899c864a37558 /Documentation/pretty-options.txt | |
| parent | pretty: expand tabs in indented logs to make things line up properly (diff) | |
| download | tgif-0893eec85fca0f76039a96cbbcd3592ff8571c24.tar.xz | |
pretty: enable --expand-tabs by default for selected pretty formats
"git log --pretty={medium,full,fuller}" and "git log" by default
prepend 4 spaces to the log message, so it makes sense to enable
the new "expand-tabs" facility by default for these formats.
Add --no-expand-tabs option to override the new default.
The change alone breaks a test in t4201 that runs "git shortlog"
on the output from "git log", and expects that the output from
"git log" does not do such a tab expansion. Adjust the test to
explicitly disable expand-tabs with --no-expand-tabs.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/pretty-options.txt')
| -rw-r--r-- | Documentation/pretty-options.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index d820653784..edbb02f18c 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -43,9 +43,15 @@ people using 80-column terminals. commit may be copied to the output. --expand-tabs:: +--no-expand-tabs:: Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is multiple of 8) in the log message before showing it in the output. ++ +By default, tabs are expanded in pretty formats that indent the log +message by 4 spaces (i.e. 'medium', which is the default, 'full', +and 'fuller'). `--no-expand-tabs` option can be used to disable +this. ifndef::git-rev-list[] --notes[=<ref>]:: |