-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
132 lines (115 loc) · 3.57 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
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
[user]
name = Cosmin Nicolaescu
email = cos@cosn.dev
signingkey = 705EB3B642869F41
[includeIf "gitdir:~/src/accrual/*"]
[user]
email = cos@accrual.com
[github]
user = cosn
[alias]
blg = log --graph --decorate --all --abbrev-commit --pretty=oneline
b = branch
br = branch --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(contents:subject) %(color:green)(%(committerdate:relative)) [%(authorname)]' --sort=-committerdate
busypeople = shortlog -6
busythisweek = shortlog --since=one.week.ago
c = commit
cam = commit -a -m
cm = commit -m
co = checkout
cob = checkout -b
cp = cherry-pick
cpx = cherry-pick -x
d = diff
dc = diff --cached
del = branch -D
dh = diff HEAD
dns = diff --name-status
ds = diff --staged
es = !git pull --rebase && git push
ignorechanges = update-index --assume-unchanged
k = !exec gitk --all&
l = log --stat -M
last = log -1 HEAD --stat
ld = log --oneline --decorate
lf = log --pretty=fuller
lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
listconf = config --global --list
ll = log --stat -M -5
ln = log --oneline --name-only
lns = log --name-status
lnss = diff --name-status --staged
lp = log -p
noticechanges = update-index --no-assume-unchanged
orphank = !gitk --all `git reflog | cut -c1-7`&
orphanl = !git log --pretty=oneline --abbrev-commit --graph --decorate `git reflog | cut -c1-7`
pop = stash pop
pub = push -u origin
pur = pull --rebase
purgeme = !git clean -fd && git reset --hard
ri = rebase --interactive --autosquash
rmmissing = !git rm $(git ls-files --deleted)
ro = !git fetch origin && git reset --hard origin/master
rv = remote -v
s = status -u -sb
scrub = !git reset --hard && git clean -fd
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
showignored = clean -ndX
showignored2 = ls-files --others --ignored --exclude-standard
showuntracked = ls-files --others --exclude-standard
slog = log --graph --simplify-by-decoration --all --abbrev-commit --pretty=oneline
st = stash --include-untracked
standup = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cD) %C(bold blue)<%an>%Creset' --since yesterday --author cosn
sync = town sync
tig = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue(%cr) %C(green)<%an>%Creset' --abbrev-commit --date=relative
undo = reset --soft HEAD^
whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
who = shortlog -s --
append = town append
compress = town compress
contribute = town contribute
diff-parent = town diff-parent
hack = town hack
kill = town kill
observe = town observe
park = town park
prepend = town prepend
propose = town propose
rename-branch = town rename-branch
repo = town repo
set-parent = town set-parent
ship = town ship
[fetch]
prune = true
pruneTags = true
[push]
default = current
autoSetupRemote = true
[pull]
rebase = true
[apply]
whitespace = fix
[rebase]
autosquash = true
autostash = true
[init]
defaultBranch = main
[rerere]
enabled = true
[core]
pager = delta
editor = nvim
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
line-numbers = true
[merge]
conflictstyle = zdiff3
[diff]
colorMoved = default
algorithm = histogram
[branch]
sort = -committerdate
[tag]
sort = taggerdate