From: Junio C Hamano Date: Wed, 13 Apr 2016 21:12:36 +0000 (-0700) Subject: Merge branch 'lt/pretty-expand-tabs' X-Git-Tag: v2.9.0-rc0~122 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cafef3d7ad3ed58d9c976bdeb604cff6b4c1f82b;p=thirdparty%2Fgit.git 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 --- cafef3d7ad3ed58d9c976bdeb604cff6b4c1f82b diff --cc Documentation/pretty-options.txt index 54b88b6dca,93ad1cdc40..6c67182728 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@@ -42,8 -42,22 +42,22 @@@ people using 80-column terminals verbatim; this means that invalid sequences in the original commit may be copied to the output. + --expand-tabs=:: + --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 '') + in the log message before showing it in the output. + `--expand-tabs` is a short-hand for `--expand-tabs=8`, and + `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, + which disables tab expansion. + + + 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'). + ifndef::git-rev-list[] ---notes[=]:: +--notes[=]:: Show the notes (see linkgit:git-notes[1]) that annotate the commit, when showing the commit log message. This is the default for `git log`, `git show` and `git whatchanged` commands when