diff options
| -rw-r--r-- | dot_config/git/config | 15 | ||||
| -rw-r--r-- | dot_config/git/difftastic.config | 10 |
2 files changed, 15 insertions, 10 deletions
diff --git a/dot_config/git/config b/dot_config/git/config index 28e9188..8817873 100644 --- a/dot_config/git/config +++ b/dot_config/git/config @@ -18,12 +18,6 @@ untrackedcache = true [diff] algorithm = histogram - external = difft - tool = difftastic -[difftool] - prompt = false -[difftool "difftastic"] - cmd = difft "$LOCAL" "$REMOTE" [fetch] prune = true pruneTags = true @@ -41,8 +35,6 @@ date = "format:%F %T%z" [merge] conflictstyle = zdiff3 -[pager] - difftool = true [pull] rebase = true [push] @@ -69,10 +61,13 @@ # platform includes [includeIf "gitdir:/home/"] - path = "~/.config/git/linux.config" + path = "linux.config" [includeIf "gitdir:/Users/"] - path = "~/.config/git/macos.config" + path = "macos.config" + +[include] + path = "local.config" # intended workflow: # own projects: clone with me: diff --git a/dot_config/git/difftastic.config b/dot_config/git/difftastic.config new file mode 100644 index 0000000..9772838 --- /dev/null +++ b/dot_config/git/difftastic.config @@ -0,0 +1,10 @@ +# vim: ft=gitconfig +[diff] + external = difft + tool = difftastic +[difftool] + prompt = false +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" +[pager] + difftool = true |