pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4e0adcade959a188c0d6e7d44a99b042e8280aec..577e1fd20eb0bd94e001b9188576ca74f99741d7 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.6.1
+DEF_VER=v1.7.0
 
 LF='
 '