-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy path.gitconfig
32 lines (32 loc) · 829 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
[user]
name = Michal Tehnik
email = [email protected]
[core]
excludesfile = ~/DropBox/Config/dotfiles/.gitignore_global
editor = atom --wait
[color]
ui = true
[push]
default = current
[branch]
autosetuprebase = always
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[merge]
keepBackup = false
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
[diff]
tool = p4merge
[difftool]
prompt = false
[difftool "p4merge"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$LOCAL\"" "\"$REMOTE\""
[alias]
atl = !git add . && git commit --amend --no-edit