Merge branch 'master' into useGitStatusCache

CheckVersion.ps1

@@ -7,7 +7,7 @@ if (!(Get-Command git -TotalCount 1 -ErrorAction SilentlyContinue)) {
 }
 
 $requiredVersion = [Version]'1.7.2'
-if ((git --version 2> $null) -match '(?<ver>\d+(?:\.\d+)+)') {
+if ([String](git --version 2> $null) -match '(?<ver>\d+(?:\.\d+)+)') {
     $version = [Version]$Matches['ver']
 }
 if ($version -lt $requiredVersion) {

chocolatey/poshgit.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>poshgit</id>
     <title>posh-git</title>
-    <version>0.5.0.201401009</version>
+    <version>0.6.0.20160310</version>
     <authors>Keith Dahlby, Mark Embling, Jeremy Skinner</authors>
     <owners>Rob Reynolds, Keith Dahlby</owners>
     <description>posh-git - A set of PowerShell scripts which provide Git/PowerShell integration.

posh-git.psd1

@@ -0,0 +1,75 @@
+@{
+
+# Script module or binary module file associated with this manifest.
+ModuleToProcess = 'posh-git.psm1'
+
+# Version number of this module.
+ModuleVersion = '0.6.0.20160310'
+
+# ID used to uniquely identify this module
+GUID = '74c9fd30-734b-4c89-a8ae-7727ad21d1d5'
+
+# Author of this module
+Author = 'Keith Dahlby and contributors'
+
+# Copyright statement for this module
+Copyright = '(c) 2010-2016 Keith Dahlby and contributors'
+
+# Description of the functionality provided by this module
+Description = 'A PowerShell environment for Git'
+
+# Minimum version of the Windows PowerShell engine required by this module
+PowerShellVersion = '2.0'
+
+# Functions to export from this module
+FunctionsToExport = @('Invoke-NullCoalescing',
+        'Write-GitStatus',
+        'Write-Prompt',
+        'Get-GitStatus',
+        'Enable-GitColors',
+        'Get-GitDirectory',
+        'TabExpansion',
+        'Get-AliasPattern',
+        'Get-SshAgent',
+        'Start-SshAgent',
+        'Stop-SshAgent',
+        'Add-SshKey',
+        'Get-SshPath',
+        'Update-AllBranches',
+        'tgit')
+
+# Cmdlets to export from this module
+CmdletsToExport = @()
+
+# Variables to export from this module
+VariablesToExport = @()
+
+# Aliases to export from this module
+AliasesToExport = @('??')
+
+# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+PrivateData = @{
+
+    PSData = @{
+
+        # Tags applied to this module. These help with module discovery in online galleries.
+        Tags = @('git')
+
+        # A URL to the license for this module.
+        LicenseUri = 'https://github.com/dahlbyk/posh-git/blob/master/LICENSE.txt'
+
+        # A URL to the main website for this project.
+        ProjectUri = 'https://github.com/dahlbyk/posh-git'
+
+        # A URL to an icon representing this module.
+        # IconUri = ''
+
+        # ReleaseNotes of this module
+        # ReleaseNotes = ''
+
+    } # End of PSData hashtable
+
+} # End of PrivateData hashtable
+
+}
+