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

Compare commits

base: geoffrey:626f274d4690d6458fe2001d443b8ee31def52f8
Branches Tags
geoffrey:main
geoffrey:mopidy
geoffrey:flakes
geoffrey:bg_nored
geoffrey:nix
geoffrey:prenix
geoffrey:crash2
..
compare: geoffrey:dc6af1cb63915bb2041fce532b831ae55945e69f
Branches Tags
geoffrey:main
geoffrey:mopidy
geoffrey:flakes
geoffrey:bg_nored
geoffrey:nix
geoffrey:prenix
geoffrey:crash2

2 commits
626f274d46 ... dc6af1cb63

Author SHA1 Message Date
Geoffrey Frogeye dc6af1cb63 Merge remote-tracking branch 'origin' 2023-11-17 19:58:09 +01:00
Geoffrey Frogeye 6046cb2df7
Add git difftool: meld 2023-11-17 19:56:56 +01:00
1 changed files with 6 additions and 1 deletions
Show stats 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"