Merge branch 'maint'

diff --git a/git-gui.sh b/git-gui.sh
index 3f5927fb2921d6e493fd1fd3d4541a7ab736f768..ca391136c8df2236f0de91617e6a417ece29bb9e 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -665,6 +665,7 @@ regsub -- {-dirty$} $_git_version {} _git_version
 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
 regsub {\.rc[0-9]+$} $_git_version {} _git_version
 regsub {\.GIT$} $_git_version {} _git_version
+regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
 
 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
        catch {wm withdraw .}