localhots
/
dotfiles
1
0
Fork 0
Code Releases Activity

Clenup git config

This commit is contained in:
Gregory Eremin 2017-10-05 13:20:00 +02:00
parent c289bd24cb
commit 8a1c230730
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
git/gitconfig
View File

@ -1,9 +1,8 @@
[hub] [hub]
protocol = https protocol = https
[user] [user]
name = Gregory Eremin name = Gregory Eremin
email = g@erem.in email = root@localhost
signingkey = EC26E86C
[credential] [credential]
helper = osxkeychain helper = osxkeychain
[alias] [alias]
@ -42,15 +41,6 @@
autocorrect = 1 autocorrect = 1
[achievement] [achievement]
upload = true upload = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
tool = Kaleidoscope
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[merge]
tool = Kaleidoscope
[filter "media"] [filter "media"]
required = true required = true
clean = git media clean %f clean = git media clean %f
@ -60,9 +50,10 @@
smudge = git hawser smudge %f smudge = git hawser smudge %f
required = true required = true
[filter "lfs"] [filter "lfs"]
clean = git lfs clean %f
smudge = git lfs smudge %f
required = true required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[url "ssh://git@github.com/"] [url "ssh://git@github.com/"]
insteadOf = https://github.com/ insteadOf = https://github.com/
[color "diff-highlight"] [color "diff-highlight"]
@ -70,3 +61,5 @@
oldHighlight = red bold 52 oldHighlight = red bold 52
newNormal = green bold newNormal = green bold
newHighlight = green bold 22 newHighlight = green bold 22
[gpg]
program = gpg2