-
Notifications
You must be signed in to change notification settings - Fork 4
Expand file tree
/
Copy pathgitconfig
More file actions
78 lines (78 loc) · 2.62 KB
/
gitconfig
File metadata and controls
78 lines (78 loc) · 2.62 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
76
77
78
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[user]
name = Benny C. Wong
email = bwong337@gmail.com
[alias]
bf = branch --force
d = diff --patch-with-stat --ignore-space-change
dc = diff --patch-with-stat --ignore-space-change --cached
co = checkout
cob = checkout -b
ci = commit
ca = commit -a
st = status
pl = pull --rebase
pu = push
br = branch
bd = branch -D
sl = stash list
sh = stash
cp = cherry-pick
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
la = log --name-status --date-order
lla = log --patch-with-stat --ignore-space-change --date-order
l = log --name-status --date-order --author=brian
lp = log --pretty=format:"%h%x09%an%x09%ad%x09%s" --author=brian
showfiles = show --pretty="format:" --name-only
ll = log --patch-with-stat --ignore-space-change --date-order --author=brian
cl = !sh -c 'git log --name-status --date-order --author=brian --no-merges --left-right --cherry-pick $0...HEAD'
cll = !sh -c 'git log --patch-with-stat --ignore-space-change --date-order --author=brian --no-merges --left-right --cherry-pick $0...HEAD'
cr = !sh -c 'git rev-list --date-order --author=brian --no-merges --left-right --cherry-pick $0...HEAD'
pp = !sh -c 'git pull && git push'
sl = stash list
sh = stash
sv = stash save
sl = stash list
sd = !sh -c 'git stash show --patch-with-stat stash@{${0/sh/0}}'
sp = !sh -c 'git stash pop stash@{${0/sh/0}}'
sa = !sh -c 'git stash apply stash@{${0/sh/0}}'
stash-drop = !sh -c 'git stash drop stash@{${0/sh/0}}'
abort-merge = reset --hard HEAD
undo-commit = reset --soft HEAD^
water = pull --rebase origin develop
conflicts = !git ls-files -u | cut -f 2 | sort -u
adduntracked=!git add $(git ls-files -o --exclude-standard)
logg = log --no-merges
[color]
ui = true
[core]
autocrlf = input
excludesfile = /Users/benny/.gitignore_global
editor = vim
pager = diff-so-fancy | less --tabs=4 -RFX
[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
[push]
default = simple
# so much color
[color]
ui = always
[color "diff"]
meta = yellow bold
commit = green bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = "red bold 52"
newNormal = "green bold"
newHighlight = "green bold 22"