写道
[http]
proxy = http://xxx.xxx.xxx.xxx:8080
sslverify = false
[user]
name = myname
email = myemail@gmail.com
[log]
abbrevCommit = true
decorate = short
[core]
autocrlf = false
[alias]
ci = commit
co = checkout
st = status -sb
ac = !git add -A && git commit
br = branch
fe = fetch
mg = merge
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
rs = remote show origin
rp = remote prune origin
[diff]
tool = p4merge
[difftool "p4merge"]
cmd = "/d/Myfiles/apps/Perforce/p4merge.exe" \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[merge]
tool = p4merge
[mergetool "p4merge"]
cmd = "/d/Myfiles/apps/Perforce/p4merge.exe" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool]
keepBackup = false
trustExitcode = false
proxy = http://xxx.xxx.xxx.xxx:8080
sslverify = false
[user]
name = myname
email = myemail@gmail.com
[log]
abbrevCommit = true
decorate = short
[core]
autocrlf = false
[alias]
ci = commit
co = checkout
st = status -sb
ac = !git add -A && git commit
br = branch
fe = fetch
mg = merge
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
rs = remote show origin
rp = remote prune origin
[diff]
tool = p4merge
[difftool "p4merge"]
cmd = "/d/Myfiles/apps/Perforce/p4merge.exe" \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[merge]
tool = p4merge
[mergetool "p4merge"]
cmd = "/d/Myfiles/apps/Perforce/p4merge.exe" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool]
keepBackup = false
trustExitcode = false
本文介绍了一种具体的Git配置方法,包括代理设置、用户信息定义、日志简化及别名设定等内容,并详细展示了如何配置Diff与Merge工具以提高代码审查与合并效率。

3158

被折叠的 条评论
为什么被折叠?



