cherry-pick: do not error on non-merge commits when '-m 1' is specified

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e80102e3071fa6970b85445aadc81581d93e271c..216beefc50d54d132991636d5f049ea0916f1696 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.20.0-rc2
+DEF_VER=v2.20.0
 
 LF='
 '