dotfiles/.gitconfig at master · jcs/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
[user]
	email = jcs@jcs.org
	name = joshua stein

[alias]
	catchup = !git fetch upstream && git rebase upstream/master
	diff-remote = diff origin..master
	ff = pull --ff-only
	fixup = rebase -i HEAD~5
	tree = log --graph --pretty=format:'[%h] [%<(8,trunc)%al] [%cs] %<(50,trunc)%s' --abbrev-commit
	touch = commit --amend --reset-author --no-edit
[color]
	ui = never
[commit]
	verbose = true
[diff]
	compaction-heuristic = true
	noprefix = true
[http]
	cookiefile = /home/jcs/.gitcookies
[merge]
	conflictStyle = "diff3"
[merge "mergiraf"]
	name = mergiraf
	driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L
[push]
	default = simple
[rebase]
	autostash = true
[safe]
	directory = /usr/src
	directory = /usr/xenocara
	directory = /usr/xenocara.cvs
	directory = /usr/ports
	directory = /mnt/src