yasuoza diary

web and life

Kawaii merge diffs in tig

Tig’s original merge diffs looks like this:

But I WANT to see merge diff like GitHub’s merge diff like:

This is enabled via tig@8370101fa.

To power this commit, install tig-HEAD.

1
2
3
4
5
6
7
8
$ git clone https://github.com/jonas/tig.git
$ cd tig
$ brew install autoconf           # If you are using OSX
$ # sudo apt-get install autoconf # If you are using Debian
$ make configure                  # This step requires 'autoconf' package
$ ./configure
$ make
$ make install

After installation, open ~/.tigrc and set following option.

1
set diff-options = -m --first-parent

Then, merge diffs in tig will be:

It’s Kawaii heart_eyes

Comments