-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
26 lines (26 loc) · 658 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
[user]
name = username
email = email
[core]
autocrlf = input
safecrlf = true
[alias]
co = checkout
ci = commit
st = status
br = branch
current = rev-parse --abbrev-ref HEAD
hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
type = cat-file -t
dump = cat-file -p
[merge]
tool = p4mergetool
[mergetool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$LOCAL $PWD/$REMOTE $PWD/$MERGED
trustExitCode = false
[mergetool]
keepBackup = false
[diff]
tool = p4mergetool
[difftool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE