summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-03-29 15:49:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-30 12:39:29 -0700
commit0893eec85fca0f76039a96cbbcd3592ff8571c24 (patch)
tree2be9e1683a91699d45472fe1b0d899c864a37558 /builtin/fmt-merge-msg.c
parentpretty: expand tabs in indented logs to make things line up properly (diff)
downloadtgif-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 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions