-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
105 lines (89 loc) · 2.37 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
103
104
105
[user]
name = Michael Welford
email = [email protected]
[push]
default = simple
[core]
excludesfile = /Users/mjw/.gitignore_global
# pager = diff-so-fancy | less --tabs=4 -RFX
pager = delta
[delta]
plus-color = "#012800"
minus-color = "#340001"
syntax-theme = Monokai Extended
[interactive]
diffFilter = delta --color-only
[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
[color]
ui = true
[color "branch"]
current = yellow
local = 241
remote = green
[color "diff"]
meta = yellow
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold
newNormal = green bold
newHighlight = green bold
[color "status"]
added = green
changed = yellow
untracked = magenta
[alias]
# mostly taken from Gary Bernhardt
s = status
st = status
ci = commit --verbose
cim = commit --verbose -m
ca = commit --all --verbose
cam = commit --all --verbose -m
co = checkout
di = diff
dc = diff --cached
amend = commit --amend
aa = add --all
ap = add --patch
ff = merge --ff-only
pullff = pull --ff-only
noff = merge --no-ff
fa = fetch --all
pom = push origin master
b = branch
ds = diff --stat=160,120
dh1 = diff HEAD~1
# Divergence (commits we added and commits remote added)
div = divergence
# Goodness (summary of diff lines added/removed/total)
gn = goodness
gnc = goodness --cached
# logging, used in flog command
ll = log --graph --format='%C(3)%h%Creset%C(1)%d%Creset - %C(4)(%ar)%Creset %s %C(4)<%an>%Creset'
# Fancy logging.
# h = head
# hp = head with patch
# r = recent commits, only current branch
# ra = recent commits, all reachable refs
# l = all commits, only current branch
# la = all commits, all reachable refs
head = !git r -1
h = !git head
hp = "!. ~/.githelpers && show_git_head"
r = !GIT_NO_PAGER=1 git l -30
ra = !git r --all
l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
dsf = "!f() { [ -z \"$GIT_PREFIX\" ] || cd \"$GIT_PREFIX\" && git diff --color \"$@\" | diff-so-fancy | less --tabs=4 -RFX; }; f"
[init]
templatedir = ~/.git_template