X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=3561376dbf69b69698c4ffecbf2dc6489d8b3434;hb=fba7a6ccc323fc1b33e241c11d2d90538b7b8c0e;hp=e175b052cfea60d3e5fac6d5b08b9600bd1ec4b9;hpb=18c9a317db0e894d03c1ffff1cb09b9834ca6a12;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index e175b05..3561376 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -111,6 +111,7 @@ include(../lib.m4)
 	sl  = stash list
 	ss  = stash save
 	ssk = stash save --keep-index
+	ssu = stash save --include-untracked
 	sa  = stash apply
 	sp  = stash pop
 
@@ -173,12 +174,7 @@ include(../lib.m4)
 	textconv = PWD/bin/sqlite3dump
 
 [merge]
-IF(OS, darwin)
-	tool = opendiff
-FI
-IF(OS, debian)
 	tool = vimdiff
-FI
 
 [format]
 	# When using git format-patch use threads and add all patches as