setup.sh: Drop unnecessary OS constant.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index e4c455df439b371d2a2b8a6aeb846ef4bd9ed0ea..3561376dbf69b69698c4ffecbf2dc6489d8b3434 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -68,6 +68,7 @@ include(../lib.m4)
        dw  = diff PATIENCE --color-words
        dc  = diff PATIENCE --cached
        dcw = diff PATIENCE --cached --color-words
+       ds  = diff --stat
        s   = status
        l   = log
        ls  = log --stat
@@ -110,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
 
@@ -172,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