By default git
usually launches vimdiff
for diffs and merges, but I would rather prefer kdiff3
gui for merges/diffs.
Here are some of my notes about how to set it up.
For a detailed list of options that
git diff
supports visit this link
git
supports various tools for merge and diff, here is a partial list:
You can setup kdiff3
by default as diff tool by executing follow command:
|
|
for other tools see here: Viewing all git diffs with vimdiff
Following commands setup the kdiff3 as the global default diff
and merge
tool.
(reference https://stackoverflow.com/q/33308482/916549)
|
|
Alternatively one can modify the config file in repository to use specific tools for a certain repository
(reference: https://stackoverflow.com/a/40817348/916549)
|
|
One of the things i found a bit annoying was that git always prompts to launch difftool, default behavior.
(reference https://stackoverflow.com/q/7897517/916549y)
|
|
or tweak the config
file for repo:
|
|
One the things I wanted to do was to diff a file between commits, following command achieves the same effect
(reference https://stackoverflow.com/q/11673434/916549)
|
|