Merge branch 'mm/checkout-auto-track-fix' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b4147d6db58133bb88d9011d1153410cf9f419ca..d801493b23d389662b5f1fa11e0cde1b3468a614 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.4.1
+DEF_VER=v1.8.4.2
 
 LF='
 '