-
Notifications
You must be signed in to change notification settings - Fork 0
/
dot-gitconfig
100 lines (79 loc) · 2.06 KB
/
dot-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
[user]
name = Peter Polacik
email = peter@polacik.org
[color]
ui = true
[core]
pager = less -x4
editor = vim
whitespace = trailing-space,space-before-tab,tab-in-indent
[merge]
summary = true
tool = vimdiff
[push]
default = current
[pull]
default = current
rebase = true
[rerere]
enabled = true
[diff]
memonicprefix = true
algorithm = patience
[branche]
autosetuprebase = always
[apply]
whitespace = nowarn
[alias]
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
lnc = log --pretty=format:"%h\\ %s \\ [%cn]"
lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%s\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%s\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
le = log --oneline --decorate
filelog = log -u
fl = log -u
dl = "!git ll -1"
dc = diff --cached HEAD^
dr = "!f() { git diff "$1"^.."$1"; }; f"
diffr = "!f() { git diff "$1"^.."$1"; }; f"
lc = "!f() { git ll "$1"^.."$1"; }; f"
f = "!git ls-files | grep -i"
grep = grep -Ii
gr = grep -Ii
la = "!git config -l | grep alias | cut -c 7-"
lasttag = describe --tags --abbrev=0
lt = describe --tags --abbrev=0
cp = cherry-pick
st = status -s
cl = clone
ci = commit
cm = commit -m
cma = commit -a -m
ca = commit --amend
amend = commit --amend
caa = commit -a --amend -C HEAD
co = checkout
br = branch
diff = diff --word-diff
dc = diff --cached
r = reset
r1 = reset HEAD^
r2 = reset HEAD^^
rh = reset --hard
rh1 = reset HEAD^ --hard
rh2 = reset HEAD^^ --hard
ai = add --interactive
sl = stash list
sa = stash apply
ss = stash save
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
[credential]
helper = osxkeychain
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[includeIf "gitdir:~/src/corp/"]
path = ~/.gitconfig-corp