diff options
| author | Charles Cabergs <charles.cabergs@colruytgroup.com> | 2022-09-06 09:13:24 +0200 |
|---|---|---|
| committer | Charles Cabergs <charles.cabergs@colruytgroup.com> | 2022-09-06 09:13:24 +0200 |
| commit | 92bbb2fb27c2726bc1c72c4e50adc88144dee4b1 (patch) | |
| tree | 66e9d25e7aa33e211c7aa48071a258cf1704f540 /config/git | |
| parent | 6525757c2aff704550ca46991ca1d11e09f11f01 (diff) | |
| parent | d54e8f15d776e59b2f8b70bb94c5041509b391f0 (diff) | |
| download | dotfiles-92bbb2fb27c2726bc1c72c4e50adc88144dee4b1.tar.gz dotfiles-92bbb2fb27c2726bc1c72c4e50adc88144dee4b1.tar.bz2 dotfiles-92bbb2fb27c2726bc1c72c4e50adc88144dee4b1.zip | |
Merge branch 'master' of https://github.com/cacharle/dotfiles
Diffstat (limited to 'config/git')
| -rw-r--r-- | config/git/config.linux | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/git/config.linux b/config/git/config.linux index 0dbbd8f..3c72be1 100644 --- a/config/git/config.linux +++ b/config/git/config.linux @@ -12,3 +12,9 @@ gpgsign = true [init] defaultBranch = master +[difftool "bat"] + cmd = "/usr/bin/bat --diff $REMOTE" +[difftool] + prompt = false +[diff] + tool = bat |