-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
54 lines (54 loc) · 1.59 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
[user]
name = Graham Pengelly
email = graham@three-tier.com
[github]
user = gpeng
[color]
diff = auto
status = auto
branch = auto
[alias]
c = commit -v
a = add
di = diff
dic = diff --cached
pl = pull --rebase
pull = pull --rebase
ps = push
pf = push --force-with-lease
st = status
out = log origin..HEAD
lol = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit
hpush = push heroku master
ci = commit
co = checkout
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit
conflicts = diff --name-only --diff-filter=U
amend = commit -a --amend --no-edit
whatadded = log --diff-filter=A
cleanup = "!git branch --merged | grep -v '\\*\\|master' | xargs -n 1 git branch -d"
fixup = "!f() { \
git commit --fixup $1; \
}; f"
autosquash = rebase -i master --autosquash
wip = commit -m 'WIP'
[core]
excludesfile = /Users/graham/.gitignore_global
[push]
default = current
[filter "media"]
clean = git media clean %f
smudge = git media smudge %f
required = true
[commit]
gpgsign = true
[diff]
compactionHeuristic = 1
[pager]
log = `brew --prefix`/share/git-core/contrib/diff-highlight/diff-highlight | less
show = `brew --prefix`/share/git-core/contrib/diff-highlight/diff-highlight | less
diff = `brew --prefix`/share/git-core/contrib/diff-highlight/diff-highlight | less
[interactive]
diffFilter = `brew --prefix`/share/git-core/contrib/diff-highlight/diff-highlight
[pull]
rebase = true