如何用git-diff显示空格和制表符 [英] How to show space and tabs with git-diff

查看:1023
本文介绍了如何用git-diff显示空格和制表符的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!

问题描述

   -  //根据值排序列表
+ //根据值排序列表

如何轻松查看删除的标签/空格的数量注释:Git 2.5+(2015年第2季度)将为空白检测提出一个更具体的选项。



请参阅)




更新Git 2.11+(2016年第四季度,一年半后):

  git config diff.wsErrorHighlight [old,new ,上下文] 

git diff / log --ws-error-highlight = < kind> 缺少相应的配置变量来默认设置它。这是添加到Git 2.11。



请参阅提交0b4b42e 提交077965f commit f3f5c7f (2016年10月4日)作者: Junio C Hamano( gitster

(由 Junio C Hamano - gitster - commit e5272d3 ,2016年10月26日)


I have the following output with git-diff.

- // sort list based on value    
+ // sort list based on value

How can I see easily see the number of removed tabs/spaces at the end of the line ?

解决方案

Note: Git 2.5+ (Q2 2015) will propose a more specific option for whitespace detection.

See commits 0e383e1, 0ad782f, and d55ef3e [26 May 2015] by Junio C Hamano (gitster).
(Merged by Junio in commit 709cd91, 11 Jun 2015)

diff.c: --ws-error-highlight=<kind> option

Traditionally, we only cared about whitespace breakages introduced in new lines.
Some people want to paint whitespace breakages on old lines, too. When they see a whitespace breakage on a new line, they can spot the same kind of whitespace breakage on the corresponding old line and want to say "Ah, those breakages are there but they were inherited from the original, so let's not touch them for now."

Introduce --ws-error-highlight=<kind> option, that lets them pass a comma separated list of old, new, and context to specify what lines to highlight whitespace errors on.

The documentation now includes:

--ws-error-highlight=<kind>

Highlight whitespace errors on lines specified by <kind> in the color specified by color.diff.whitespace.
<kind> is a comma separated list of old, new, context.
When this option is not given, only whitespace errors in new lines are highlighted.

E.g. --ws-error-highlight=new,old highlights whitespace errors on both deleted and added lines.
all can be used as a short-hand for old,new,context.

For instance, the old commit had one whitespace error (bbb), but you can focus on the new errors only:

(test done after t/t4015-diff-whitespace.sh)


Update Git 2.11+ (Q4 2016, a year and half later) :

git config diff.wsErrorHighlight [old,new,context]

git diff/log --ws-error-highlight=<kind> lacked the corresponding configuration variable to set it by default. That is added in Git 2.11.

See commit 0b4b42e, commit 077965f, commit f3f5c7f (04 Oct 2016) by Junio C Hamano (gitster).
(Merged by Junio C Hamano -- gitster -- in commit e5272d3, 26 Oct 2016)

这篇关于如何用git-diff显示空格和制表符的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!

查看全文
登录 关闭
扫码关注1秒登录
发送“验证码”获取 | 15天全站免登陆