Andrew's git / gitweb.git / diff
?
Merge branch 'nd/versioncmp-prereleases'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 20:11:45 +0000 (13:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 20:11:45 +0000 (13:11 -0700)
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

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history
t/t7004-tag.sh patch | diff1 | diff2 | blob | history
diff --cc Documentation/config.txt
Simple merge
diff --cc t/t7004-tag.sh
Simple merge