-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
40 lines (39 loc) · 902 Bytes
/
gitconfig
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
[user]
name = Tommi Carleman
email = [email protected]
[github]
user = tommica
[color]
diff = auto
status = auto
branch = auto
[color "branch"]
current = yellow reverse
remote = green bold
local = blue bold
[color "diff"]
meta = blue bold
frag = magenta bold
old = red bold
new = green bold
[push]
default = current
[core]
editor = nano
excludesfile = ~/.gitignore
[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args \"$LOCAL\" \"$PWD/$REMOTE\"
[merge]
tool = meld
[mergetool]
prompt = false
[mergetool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output=\"$PWD/$MERGED\"