misc

MaskRay · Feb 18, 2024 · 753d034 · 753d034
1 parent c165e7b
commit 753d034
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/home/.alias b/home/.alias
@@ -442,7 +442,7 @@ gbl() {
   sed 's#^remotes/##'
 }
 
-gt() {
+gtag() {
   is_in_git_repo || return
   git tag --sort -version:refname |
   fzf-down --multi --preview-window right:70% \

diff --git a/home/.gitconfig b/home/.gitconfig
@@ -84,7 +84,7 @@
 [diff]
   mnemonicprefix = true
   tool = vimdiff
-  algorithm = patience
+	algorithm = histogram
 [diff "lisp"]
   xfuncname="^(\\((def|test).*)$"
 [diff "python"]
@@ -96,7 +96,10 @@
 [log]
   date = local
 [merge]
-  tool = vimdiff
+	tool = nvim
+	conflictStyle = zdiff3
+[mergetool "nvim"]
+	cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
 #[mergetool "vimdiffnice"]
 #  cmd = vimdiff -c \"wincmd J\" -c \"/<<<<<<< \" $MERGED $LOCAL $BASE $REMOTE
 [pretty]