-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
39 lines (32 loc) · 900 Bytes
/
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
[user]
name = Kevin Wu
email = [email protected]
[alias]
co = checkout
ci = commit
st = status
br = branch -v
hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
type = cat-file -t
dump = cat-file -p
ap = add -p
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = '!git ls-files -v | grep ^h | cut -c 3-'
snapshot = !git stash save 'snapshot: $(date)' && git stash apply 'stash@{0}'
[core]
editor = code -w
excludesfile = ~/.gitignore
[help]
autocorrect = 50
[color]
ui = true
[merge]
tool = p4merge
[mergetool "p4merge"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$LOCAL $PWD/$REMOTE $PWD/$MERGED
keepTemporaries = false
trustExitCode = false
keepBackup = false
[difftool "p4merge"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE