geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Geoffrey Frogeye 2023-11-23 22:41:45 +01:00
parent 65d1594ec9 dc6af1cb63
commit 58b4fbcdf0
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/git/config
View file

@ -16,4 +16,9 @@
required = true required = true
[pull] [pull]
ff = only ff = only
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"