-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
35 lines (35 loc) · 847 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
[user]
name = Jan Klausa
email = jan@klausa.pl
[core]
excludesfile = /Users/klausa/.gitignore_global
difftool = Kaleidoscope
[push]
default = current
[pull]
rebase = false
[merge]
tool = Kaleidoscope
[diff]
tool = Kaleidoscope
[mergetool]
prompt = false
[difftool]
prompt = false
[diff "localizablestrings"]
textconv = "iconv -f utf-16 -t utf-8"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[init]
defaultBranch = main
[alias]
dotfiles = !git --git-dir=$HOME/.dotfiles.git --work-tree=$HOME
[rerere]
enabled = true
[help]
autocorrect = 15
[blame]
ignoreRevsFile = .git-blame-ignore-revs