-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
102 lines (100 loc) · 2.02 KB
/
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
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
[user]
email = [email protected]
name = Artur Debski
[color]
ui = true
[core]
editor = vim
excludesfile = /Users/mentero/.gitignore
autocrlf = input
[merge]
tool = opendiff
[alias]
co = checkout
s = status
st = status
pull = pull --rebase
pure = pull --rebase
hard = reset --hard
soft = reset --soft
ss = status -s -b
##########
d = diff
##########
c = commit
cm = commit -m
ca = commit --amend
##########
a = add
ad = add .
aa = add -A
ap = add -p
##########
l = log --oneline
lg = log --oneline --graph --decorate
##########
co = checkout
cob = checkout -b
##########
rb = rebase
rbi = rebase -i
##########
b = branch
ba = branch -a
bm = branch --merge
bnm = branch --no-merge
##########
m = merge
##########
pat = format-patch master --stdout
patd = format-patch develop --stdout
##########
; st = stash
stp = stash pop
##########
ps = push
pl = pull
pb = pull --rebase
pso = push origin
plo = pull origin
pbo = pull --rebase origin
##########
subpl = submodule foreach git pull origin master
[color "branch"]
current = yellow bold
local = white
remote = cyan
[color "diff"]
meta = white dim
frag = cyan dim
whitespace = red reverse
[color "status"]
added = green
changed = red
untracked = yellow
[color "decorate"]
HEAD = green
branch = blue
remoteBranch = cyan
stash = white dim
tag = magenta
[push]
default = tracking
[branch]
autosetupmerge = true
[apply]
whitespace = nowarn
[mergetool]
keepBackup = false
[rerere]
enabled = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[filter "media"]
clean = git media clean %f
smudge = git media smudge %f
required = true