changed Makefile; build all commands as an own file

[NeonServV5.git] / version.sh

diff --git a/version.sh b/version.sh
index 17f238216f835b8e566b3fb6c0349fb65c17e7fe..caaff7e670393a29829e8d0eb986017d95586557 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -25,7 +25,7 @@ if test "x$svn_revision" = "x" ; then
   if test "x$svn_revision" = "x" ; then
     svn_revision="0"
   else
-    git_commitcount=`git rev-list --all | wc -l | sed "s/[ \t]//g"`
+    git_commitcount=`git rev-list --all --no-merges | wc -l | sed "s/[ \t]//g"`
     svn_revision="git-$git_commitcount-$svn_revision"
   fi
 else