Git with KDiff3 – Windows

Hey all,

Just a quick post showing the config I needed to use in order to get KDiff3 working with git. It took a while to get this working so hopefully it’ll be able to help someone else out.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
#Config file
[user]
	email = test@test.com.au
	name = test
[core]
	editor = \"C:\\Program Files\\Sublime Text 2\\sublime_text.exe\"
 
[apply]
    whitespace = fix
 
[color]
    branch = auto
    diff = auto
    interactive = auto
    status = auto
 
 
[core]
        pager = less -FRSX
        whitespace = cr-at-eol
        autocrlf = input
        excludesfile = /Users/test/.gitignore_global
        editor = mate -w
 
[alias]
        co = checkout
        lg = log --graph --pretty=oneline --abbrev-commit
 
[gui]
	recentrepo = Y:/Projects/Junk
	recentrepo = C:/xampp/htdocs/onlinemedia
[merge]
	tool = kdiff3

Screenshot of git config from GUI:

Git Config KDiff

Git Config KDiff

Running KDiff3:

Executing KDiff3

Executing KDiff3

KDiff3 display:

KDiff3 Display

KDiff3 Display

Leave a Reply