From 7aa1b8d3dd75b25f588b94b50283ac92a5f925ea Mon Sep 17 00:00:00 2001
From: Adam Hellberg <sharparam@sharparam.com>
Date: Sun, 22 Jan 2023 17:09:35 +0100
Subject: [PATCH] Set up difftastic for git

---
 git/.gitconfig | 10 ++++++++++
 zsh/.zshrc     |  1 +
 2 files changed, 11 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index b31d4a0..414919b 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -2,6 +2,8 @@
   email = sharparam@sharparam.com
   name = Adam Hellberg
   signingkey = C58C41E27B00AD04
+[alias]
+  dft = difftool
 [push]
   default = simple
   autoSetupRemote = true
@@ -19,6 +21,14 @@
   mergeoptions = --no-ff
 [branch "develop"]
   mergeoptions = --no-ff
+[diff]
+  tool = difft
+[difftool]
+  prompt = false
+[difftool "difft"]
+  cmd = difft "$LOCAL" "$REMOTE"
+[pager]
+  difftool = true
 [pull]
   #rebase = true
   ff = only
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4151b17..6be7b68 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -184,6 +184,7 @@ alias .......='../../../../../..'
 # Git aliases
 alias ga='git add'
 alias gst='git status'
+alias gdt='git difftool'
 
 alias vi='nvim'
 alias vim='nvim'
-- 
2.54.0