extern/dotfiles
1
0
Fork 0
mirror of https://github.com/Lissy93/dotfiles.git synced 2025-06-28 13:01:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adds link to .gitconfigglobal

Browse Source
This commit is contained in:
Alicia Sykes 2022-09-18 17:11:35 +01:00
parent c1a3e9ee33
commit 14af202030
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configs/.gitconfig
View File

@ -12,7 +12,7 @@
editor = nvim editor = nvim
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
pager = delta pager = delta
excludesfile = ~/.config/.gitignore_global excludesfile = /Users/alicia/.config/.gitignore_global
[web] [web]
browser = firefox browser = firefox
[instaweb] [instaweb]
@ -268,3 +268,9 @@
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Users/alicia/Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true