fun with computers and git

I’ve been using git as my scm system for a while now, but getting it to work nicely on windows can sometimes be a real pain, especially when running cygwin 1.7 and still having to connect to subversion as well. Granted the git svn command works, but some of the latest patches have caused a couple of hiccups too.

Add a dose of a primary hard drive crash and you have for a busy couple weeks. Finally I’ve managed to reinstall most of my necessary software, but I lost my .gitconfig file. So, for future reference, here are a couple of essentials needed to get git, svn and kdiff3 working (at least for now). All of it can be done with the git config command, but it is so much easier to just cut and paste.

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

[user]
	name = David Mitchell
	email = mitchelld@acm.org
[color]
	interactive = always
	status = always
	pager = true
	branch = always
	patch = always
	ui = always
	diff = always
	grep = always
[format]
	pretty = medium
[merge]
	tool = kdiff3
[mergetool "kdiff3"]
	path = C:/Tools/KDiff3/kdiff3.exe 
[diff]
	tool = kdiff3
[difftool "kdiff3"]
	path = C:/Tools/KDiff3/kdiff3.exe
[difftool]
	prompt = false
[mergetool]
	prompt = false