dotfiles/gitconfig at master · sabl0r/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
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
[core]
	pager = delta
[user]
	email = philip.taffner@bluegfx.de
	name = Philip Taffner
[alias]
	st = status -sb
	ci = commit
	co = checkout
	br = branch
	rb = rebase
	d = -c color.diff.old='white red' -c color.diff.new='black green' diff --word-diff=color
	dc = diff --cached
	dl = diff HEAD~1..HEAD
	sl = stash list
	sp = stash pop
	unstage = reset HEAD --
	uncommit = reset --soft HEAD^
	last = log -1 HEAD
	aliases = "!git config -l | grep alias | cut -c 7-"
	conflicts = "diff --name-only --diff-filter=U"
	ls = log --pretty=format:"%C(yellow)%h\\ %ad%C(auto)%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate --date=short
	ll = log --pretty=format:"%C(yellow)%h\\ %ad%C(auto)%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate --numstat --date=short
	theirs = !bash -c 'git ls-files --unmerged $1 | cut -f 2 | uniq | tee >(xargs -r git checkout --theirs --) >(xargs -r git add)' -
	ours = !bash -c 'git ls-files --unmerged $1 | cut -f 2 | uniq | tee >(xargs -r git checkout --ours --) >(xargs -r git add)' -
[color]
	ui = true
[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green
[color "diff"]
	meta = yellow bold
	frag = magenta bold
	old = red
	new = cyan
	whitespace = red reverse
[color "status"]
	added = yellow
	changed = green
	untracked = cyan
[push]
	default = simple
[rerere]
	enabled = true
[diff]
	algorithm = patience
	colorMoved = default
[interactive]
	diffFilter = delta --color-only
[merge]
	conflictstyle = diff3
[delta]
	line-numbers = true
	side-by-side = true
	syntax-theme = Monokai Extended