1
0
Эх сурвалжийг харах

git difftool via kitty diff

https://sw.kovidgoyal.net/kitty/kittens/diff/
raylu 3 жил өмнө
parent
commit
8cb97ab5e7
2 өөрчлөгдсөн 32 нэмэгдсэн , 1 устгасан
  1. 23 0
      config/kitty/diff.conf
  2. 9 1
      gitconfig

+ 23 - 0
config/kitty/diff.conf

@@ -0,0 +1,23 @@
+pygments_style paraiso-dark
+
+background #222
+foreground #eee
+
+title_fg #eee
+title_bg #222
+
+margin_bg #333
+margin_fg #ddd
+
+removed_bg           #533
+highlight_removed_bg #633
+removed_margin_bg    #644
+
+added_bg           #353
+highlight_added_bg #363
+added_margin_bg    #464
+
+filler_bg #445
+
+hunk_margin_bg #444
+hunk_bg        #555

+ 9 - 1
gitconfig

@@ -54,7 +54,15 @@
 	default = upstream
 
 [diff]
-	tool = vimdiff
+	tool = kitty
+	guitool = kitty.gui
+[difftool]
+	prompt = false
+	trustExitCode = true
+[difftool "kitty"]
+	cmd = kitty +kitten diff $LOCAL $REMOTE
+[difftool "kitty.gui"]
+	cmd = kitty kitty +kitten diff $LOCAL $REMOTE
 
 [log]
 	decorate = true