dotfiles/.gitconfig at master · stuartw/dotfiles · GitHub

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
34
35
36
37
[user]
	name = stuartw
	email = stuart.wakefield@gmail.com
[color]
	diff = auto
	status = auto
	branch = auto
	interactive = auto
[merge]
    tool = meld
	summary = true
[core]
	excludesfile = ~/.gitignore
[alias]
	my-cvsimport = cvsimport -k
	my-cvsexportcommit = cvsexportcommit -p -v -c
	my-merge = merge --no-ff
	lol = log --graph --decorate --pretty=oneline --abbrev-commit
	lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
[help]
	autocorrect = 1
[mergetool "p4merge"]
	cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false
[mergetool "meld"]
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
[apply]
	whitespace = fix
[github]
	user = stuartw
	token = CHANGEME
[svn]
	rmdir = 1