GeorgeSG/dotfiles
1
0
Fork 0
mirror of https://github.com/GeorgeSG/dotfiles.git synced 2026-09-05 08:58:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor giconfig, remove platform-specific stuff

Browse Source
This commit is contained in:
GeorgeSG
2016-01-04 14:31:07 +02:00
parent a4700c8144
commit 45c3a457f1
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitconfig
+5 -15
View File
@@ -1,13 +1,5 @@
# local user config, usernames, etc
[include]
path=~/.gitconfig-local
[core] [core]
editor = gvim --nofork editor = gvim --nofork
excludesfile = /Users/georgi/.gitignore_global
[merge]
tool = kdiff3
[diff]
tool = kdiff3
[color] [color]
diff = auto diff = auto
status = auto status = auto
@@ -43,9 +35,7 @@
clean = git media clean %f clean = git media clean %f
smudge = git media smudge %f smudge = git media smudge %f
required = true required = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\" # local user config, usernames, etc
path = [include]
[mergetool "sourcetree"] path=~/.gitconfig-local
cmd = /opt/homebrew-cask/Caskroom/sourcetree/2.0.4/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true