diff-so-fancy

Good-lookin' diffs. Actually… nah… The best-lookin' diffs. ?

Github星跟踪图

diff-so-fancy Circle CI build TravisCI build AppVeyor build

diff-so-fancy strives to make your diffs human readable instead of machine readable. This helps improve code quality and helps you spot defects faster.

Screenshot

Vanilla git diff vs git and diff-so-fancy

diff-highlight vs diff-so-fancy

Install

Installation is as simple as downloading the diff-so-fancy script to a directory in your path.
Windows users may need to install MinGW or the Windows subsystem for Linux.

diff-so-fancy is also available from NPM, Nix, brew, and as a package on Arch Linux.

Usage

Configure git to use diff-so-fancy for all diff output:

git config --global core.pager "diff-so-fancy, less --tabs=4 -RFX"

Improved colors for the highlighted bits

The default Git colors are not optimal. The colors used for the screenshot above were:

git config --global color.ui true

git config --global color.diff-highlight.oldNormal    "red bold"
git config --global color.diff-highlight.oldHighlight "red bold 52"
git config --global color.diff-highlight.newNormal    "green bold"
git config --global color.diff-highlight.newHighlight "green bold 22"

git config --global color.diff.meta       "11"
git config --global color.diff.frag       "magenta bold"
git config --global color.diff.commit     "yellow bold"
git config --global color.diff.old        "red bold"
git config --global color.diff.new        "green bold"
git config --global color.diff.whitespace "red reverse"

Options

markEmptyLines

Should the first block of an empty line be colored. (Default: true)

git config --bool --global diff-so-fancy.markEmptyLines false

changeHunkIndicators

Simplify git header chunks to a more human readable format. (Default: true)

git config --bool --global diff-so-fancy.changeHunkIndicators false

stripLeadingSymbols

Should the pesky + or - at line-start be removed. (Default: true)

git config --bool --global diff-so-fancy.stripLeadingSymbols false

useUnicodeRuler

By default, the separator for the file header uses Unicode line-drawing characters. If this is causing output errors on your terminal, set this to false to use ASCII characters instead. (Default: true)

git config --bool --global diff-so-fancy.useUnicodeRuler false

rulerWidth

By default, the separator for the file header spans the full width of the terminal. Use this setting to set the width of the file header manually.

git config --global diff-so-fancy.rulerWidth 47    # git log's commit header width

Contributing

Pull requests are quite welcome, and should target the next branch. We are also looking for any feedback or ideas on how to make diff-so-fancy even fancier.

Other documentation

License

MIT

主要指标

概览
名称与所有者so-fancy/diff-so-fancy
主编程语言Perl
编程语言Shell (语言数: 2)
平台
许可证MIT License
所有者活动
创建于2016-02-04 11:32:08
推送于2025-05-06 18:47:34
最后一次提交2023-06-09 13:07:02
发布数43
最新版本名称v1.4.4 (发布于 )
第一版名称v0.1.0 (发布于 2016-02-08 21:18:14)
用户参与
星数17.6k
关注者数114
派生数335
提交数727
已启用问题?
问题数290
打开的问题数27
拉请求数160
打开的拉请求数5
关闭的拉请求数46
项目设置
已启用Wiki?
已存档?
是复刻?
已锁定?
是镜像?
是私有?