-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
89 lines (87 loc) · 2.01 KB
/
Copy pathgitconfig
File metadata and controls
89 lines (87 loc) · 2.01 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
79
80
81
82
83
84
85
86
87
88
89
[user]
name = BZ
email = brianbzhang@gmail.com
# [user]
# name = Zoe
# email = surui2890@gmail.com
[github]
user = atav32
[hub]
host = git.corp.stripe.com
[alias]
a = add
add-unmerged = "!git add $(git diff --name-only --diff-filter=U --relative)"
b = branch
bo = branch
branches = branch
c = commit
co = checkout
di = diff
edit-unmerged = "!$EDITOR -O $(git diff --name-only --diff-filter=U --relative)"
fin = finish
last = diff-tree --no-commit-id --name-status -r HEAD~1..HEAD
lg = log --graph
master = checkout master
o = log --graph origin..HEAD
out = log --graph origin..HEAD
outgoing = log --graph origin..HEAD
pl = pull
ps = push
revert = checkout HEAD
st = status
sum = status
uncommit = reset --soft HEAD^
unmerged = diff --name-only --diff-filter=U --relative
unstage = reset HEAD
up = checkout
vimdiff = difftool --tool=vimdiff --no-prompt
[branch]
autosetuprebase = always
[color]
branch = auto
diff = auto
grep = auto
interactive = auto
status = auto
ui = 1
[color "diff"]
frag = magenta
meta = yellow bold
new = green reverse white
old = red reverse white
[core]
editor = vim
excludesfile = /Users/brian/.gitignore_global
[diff]
mnemonicprefix = true
renames = copies
tool = vimdiff
[help]
autocorrect = 1
[filter "lfs"]
clean = git-lfs clean -- %f
process = git-lfs filter-process
required = true
smudge = git-lfs smudge -- %f
[log]
decorate = full
[merge]
tool = vimdiff3
[mergtool "vimdiff3"]
cmd = vim -f -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
prompt = false
[mergetool "vscode"]
cmd = code --wait $MERGED
prompt = false
[difftool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
[push]
default = current
[rerere]
enabled = 1
[url "http://"]
insteadOf = git://
[url "https://"]
insteadOf = git://