Merge branch 'nd/versioncmp-prereleases'
commitf57610a1ff7a547d1e11e24f942b1703cea81f81
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 20:11:45 +0000 (20 13:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 20:11:45 +0000 (20 13:11 -0700)
treeb1157b51c682216794a750556aae362830ade856
parent9ab698f4000a736864c41f57fbae1e021ac27799
parent5751a3d1954cd2e362ba1ca9625acdc8c5185a25
Merge branch 'nd/versioncmp-prereleases'

The versionsort.prerelease configuration variable can be used to
specify that v1.0-pre1 comes before v1.0.

* nd/versioncmp-prereleases:
  config.txt: update versioncmp.prereleaseSuffix
  versionsort: support reorder prerelease suffixes
Documentation/config.txt
t/t7004-tag.sh