-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
66 lines (63 loc) · 1.51 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
55
56
57
58
59
60
61
62
63
64
65
66
[user]
name = kuzhi
email = [email protected]
[core]
editor = vim
excludesfile = /Users/zhangmin/.gitignore_global
[color]
ui = true
[alias]
co = checkout
br = branch
cm = commit
st = status
df = diff
lg = log
lo = log --oneline
cp = cherry-pick
rb = rebase
unstage = reset HEAD --
last = log -1 HEAD
visual = !gitk
[sendemail]
from = Rudy Zhang <[email protected]>
smtpserver = smtp.gmail.com
smtpuser = [email protected]
smtpserverport = 587
smtpencryption = tls
confirm = auto
smtppass = xtaytxgt710220
chainreplyto = false
#[http]
# proxy = socks5://127.0.0.1:1080
#[https]
# proxy = socks5://127.0.0.1:1080
[gc]
autoDetach = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[commit]
template = /Users/zhangmin/.stCommitMsg
[merge]
tool = p4mergetool
[mergetool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
trustExitCode = false
[mergetool]
keepBackup = false
prompt = false
[diff]
tool = p4mergetool
[difftool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE
[difftool]
prompt = false
[difftool "sourcetree"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true