X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=2747b9235d4533990ea361ae4a4c8c5d08e99ac2;hb=e4c16ff97afe69adec52cbbf4b4d66455d4a3371;hp=d59568ff712b6b7db01e0a1df3c4eb037cc5349b;hpb=3d813d58d987714c1be95a7f963df9ba2453bbe7;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index d59568f..2747b92 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,7 +2,7 @@
 
 # Setup script for VCS configuration files.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,9 +21,17 @@
 . ../lib.sh
 
 if installed git; then
+    # Older Git versions don't support --patience.
+    PATIENCE=
+    if git diff --patience >/dev/null 2>&1; then
+        PATIENCE=--patience
+    fi
+
     generate m4 gitconfig \
         -DGITIGNORE=`pwd`/gitignore \
-        -DOS=`os`
+        -DPATIENCE="$PATIENCE" \
+        -DOS=`os` \
+        -DTIG="`pwd`/tig.pl"
     link gitconfig ~/.gitconfig
 fi