Repository navigation
Expand file tree
/
Copy pathdot_gitconfig.tmpl
More file actions
75 lines (72 loc) · 1.49 KB
/
Copy pathdot_gitconfig.tmpl
File metadata and controls
75 lines (72 loc) · 1.49 KB
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
[user]
name = Josh Johnson
email = {{ .snodots.gitEmail }}
[diff]
algorithm = histogram
colorMoved = plain
mnemonicPrefix = true
renames = true
[color]
ui = auto
[column]
ui = auto
[merge]
tool = vimdiff
[branch]
sort = -committerdate
[tag]
sort = version:refname
[column]
ui = auto
[push]
default = current
[fetch]
prune = true
pruneTags = true
[rerere]
enabled = true
autoupdate = true
[core]
fileMode = false
autocrlf = input
excludesfile = ~/.gitignore
[alias]
st = status
ci = commit
co = checkout
di = diff
dc = diff --cached
amend = commit --amend
aa = add --all
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
fp = push --force-with-lease origin HEAD
# Divergence (commits we added and commits remote added)
div = divergence
# Goodness (summary of diff lines added/removed/total)
gn = goodness
gnc = goodness --cached
# 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 l -1
h = !git head
hp = "!. ~/.githelpers && show_git_head"
r = !git l -30
ra = !git r --all
l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
{{ if .snodots.isWork }}
[include]
path = ~/.workfiles/git/config
{{ end -}}