Make generate-git-snapshot.sh work for merge window trees
    
    Use sed to drop anything ending in -git.*.  That allows us to grab the version
    information for the main tree while -rc* will still work later.