diff options
author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-05-04 00:38:07 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-05-19 21:06:40 -0700 |
commit | 374664478f204ab45bbd494ab21492f331d8b1f0 (patch) | |
tree | cffee347834a26d724cdd700a75ee59cf4fb52a9 /Documentation/git-fmt-merge-msg.txt | |
parent | Git 1.7.1 (diff) | |
download | tgif-374664478f204ab45bbd494ab21492f331d8b1f0.tar.xz |
diff: fix coloring of extended diff headers
Coloring the extended headers where done as a whole not per line. less with
option -R (which is the default from git) does not support this coloring
mode because of performance reasons. The -r option would be an alternative
but has problems with lines that are longer than the screen. Therefore
stick to the idiom to color each line separately. The problem is, that the
result of ill_metainfo() will also be used as an parameter to an external
diff driver, so we need to disable coloring in this case.
Because coloring is now done inside fill_metainfo() we can simply add this
string to the diff header and therefore keep the last newline in the
extended header. This results also into the fact that the external diff
driver now gets this last newline too. Which is a change in behavior
but a good one.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
0 files changed, 0 insertions, 0 deletions