contrib: add 'git difftool' for launching common merge tools

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index cb7cd4b53827fa6820e84b1318572d0115b3b17f..6c7465c75865577a87260c7936cb286ab84c6db6 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.6.GIT
+DEF_VER=v1.6.0.2.GIT
 
 LF='
 '
@@ -16,6 +16,7 @@ elif test -d .git -o -f .git &&
        case "$VN" in
        *$LF*) (exit 1) ;;
        v[0-9]*)
+               git update-index -q --refresh
                test -z "$(git diff-index --name-only HEAD --)" ||
                VN="$VN-dirty" ;;
        esac