Merge branch 'master' into develop-to-master

.travis.yml

@@ -2,7 +2,7 @@ language: generic
 
 branches:
   only:
-  - develop
+  - master
 
 stages:
 - name: linux

CHANGELOG.md

@@ -71,7 +71,7 @@ If you are still on Windows PowerShell 2.0, 3.0 or 4.0, please continue to use t
   ([#282](https://github.com/dahlbyk/posh-git/issues/282))
   ([PR #447](https://github.com/dahlbyk/posh-git/pull/447))
 
-## 0.7.2 - January 10, 2018
+## 0.7.3 - April 19, 2018
 
 - posh-git now exports the variable `$GitPromptScriptBlock` which contains the code for the default prompt.
   ([#501](https://github.com/dahlbyk/posh-git/issues/501))
@@ -89,8 +89,6 @@ If you are still on Windows PowerShell 2.0, 3.0 or 4.0, please continue to use t
   Import-Module posh-git
   ```
 
-- Added `Add-PoshGitToProfile -AllUsers` support
-  ([PR #504](https://github.com/dahlbyk/posh-git/pull/504))
 - Fixed 'Write-Prompt' to be able use Black as foreground color.
   ([#470](https://github.com/dahlbyk/posh-git/pull/470))
   ([PR #468](https://github.com/dahlbyk/posh-git/pull/468))
@@ -105,6 +103,8 @@ If you are still on Windows PowerShell 2.0, 3.0 or 4.0, please continue to use t
 - Fixed directory names that contain [brackets] cause GitPrompt to fail.
   ([PR #502](https://github.com/dahlbyk/posh-git/pull/502))
   Thanks Duncan Smart (@duncansmart)
+- Added `Add-PoshGitToProfile -AllUsers` support
+  ([PR #504](https://github.com/dahlbyk/posh-git/pull/504))
 - Fixed duplicated branch completion for git checkout
   ([#505](https://github.com/dahlbyk/posh-git/issues/505))
   ([PR #506](https://github.com/dahlbyk/posh-git/pull/506))
@@ -116,11 +116,25 @@ If you are still on Windows PowerShell 2.0, 3.0 or 4.0, please continue to use t
 - Fixed errors added to $Error collection by `Get-GitStatus` command
   ([#500](https://github.com/dahlbyk/posh-git/issues/500))
   ([PR #514](https://github.com/dahlbyk/posh-git/pull/514))
-- Add custom path rendering in prompt
+- Added custom path rendering in prompt
   ([#469](https://github.com/dahlbyk/posh-git/issues/469))
   ([PR #520](https://github.com/dahlbyk/posh-git/pull/520))
 - Clean up wording for work dir local status in help file
   ([PR #516](https://github.com/dahlbyk/posh-git/pull/516))
+- Added `$GitPromptSettings.AdminTitlePrefixText` (default: `'Administrator: '`)
+  ([#537](https://github.com/dahlbyk/posh-git/pull/537))
+  ([PR #538](https://github.com/dahlbyk/posh-git/pull/538))
+  Thanks Eric Jorgensen (@nebosite)
+- Added `$GitPromptSettings.UntrackedFilesMode`;
+  accepted values are `$null` (inherit `status.showUntrackedFiles`), "all", "no", and "normal"
+  ([#556](https://github.com/dahlbyk/posh-git/pull/556))
+  ([PR #557](https://github.com/dahlbyk/posh-git/pull/557))
+  Thanks David Snedecor (@TheSned)
+- `PoshGitVcsPrompt` errors now show details if `$GitPromptSettings.Debug`
+  ([PR #560](https://github.com/dahlbyk/posh-git/pull/560))
+- Exported `Expand-GitCommand` for use with custom tab expansion
+  ([#562](https://github.com/dahlbyk/posh-git/pull/562))
+  ([PR #563](https://github.com/dahlbyk/posh-git/pull/563))
 - Add code coverage to Coveralls.io
   ([#416](https://github.com/dahlbyk/posh-git/pull/416))
   ([PR #461](https://github.com/dahlbyk/posh-git/pull/461))

ISSUE_TEMPLATE.md

@@ -14,7 +14,7 @@ If not, PLEASE fill in the following details so that we can help you!
 To retrieve the system details, paste the following line into PowerShell, press Enter
 and then copy/paste the resulting output above.
 
-"- posh-git version/path: $($m = Get-Module posh-git; '{0} {1} {2}' -f $m.Version,$m.PrivateData.PSData.PreReleaseVersion,$m.ModuleBase.Replace($HOME,'~'))`n- PowerShell version: $($PSVersionTable.PSVersion)`n- $(
+"- posh-git version/path: $($m = Get-Module posh-git; '{0} {1} {2}' -f $m.Version,$m.PrivateData.PSData.Prerelease,$m.ModuleBase.Replace($HOME,'~'))`n- PowerShell version: $($PSVersionTable.PSVersion)`n- $(
 git --version)`n- OS: $([System.Environment]::OSVersion)"
 -->
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016 Keith Dahlby and contributors
+Copyright (c) 2010-2018 Keith Dahlby and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -1,13 +1,8 @@
 # posh-git
 
-[![master build status](https://ci.appveyor.com/api/projects/status/eb8erd5afaa01w80/branch/master?svg=true&pendingText=master%20%E2%80%A3%20pending&failingText=master%20%E2%80%A3%20failing&passingText=master%20%E2%80%A3%20passing)](https://ci.appveyor.com/project/dahlbyk/posh-git/branch/master)
-[![master build coverage](https://coveralls.io/repos/github/dahlbyk/posh-git/badge.svg?branch=master)](https://coveralls.io/github/dahlbyk/posh-git?branch=master)
-
-[![develop build status](https://ci.appveyor.com/api/projects/status/eb8erd5afaa01w80/branch/develop?svg=true&pendingText=develop%20%E2%80%A3%20pending&failingText=develop%20%E2%80%A3%20failing&passingText=develop%20%E2%80%A3%20passing)](https://ci.appveyor.com/project/dahlbyk/posh-git/branch/develop)
-[![develop build coverage](https://coveralls.io/repos/github/dahlbyk/posh-git/badge.svg?branch=develop)](https://coveralls.io/github/dahlbyk/posh-git?branch=develop)
-
 [![Join the chat at https://gitter.im/dahlbyk/posh-git](https://badges.gitter.im/dahlbyk/posh-git.svg)](https://gitter.im/dahlbyk/posh-git?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![posh-git on Chocolatey](https://img.shields.io/chocolatey/dt/poshgit.svg)](https://chocolatey.org/packages/poshgit/)
+[![posh-git on PowerShell Gallery](https://img.shields.io/powershellgallery/dt/posh-git.svg)](https://www.powershellgallery.org/packages/posh-git/)
 
 posh-git is a PowerShell module that integrates Git and PowerShell by providing Git status summary information that can be displayed in the PowerShell prompt, e.g.:
 ```powershell
@@ -19,19 +14,53 @@ That will tab complete to `git checkout` and if you keep pressing <kbd>tab</kbd>
 You can also tab complete remote names and branch names e.g.: `git pull or<tab> ma<tab>` tab completes to `git pull origin master`.
 
 ## Versions
-- `master` avoids breaking changes, maintaining v0.x.
-  ( [README](https://github.com/dahlbyk/posh-git/blob/master/README.md)
-  • [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/master/CHANGELOG.md) )
-- `develop` includes breaking changes, toward [v1.0](https://github.com/dahlbyk/posh-git/issues/328).
-  ( [README](https://github.com/dahlbyk/posh-git/blob/develop/README.md)
-  • [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/develop/CHANGELOG.md) )
-- Previous releases:
-  - v0.7.1
-    ( [README](https://github.com/dahlbyk/posh-git/blob/v0.7.1/README.md)
-    • [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/v0.7.1/CHANGELOG.md) )
-  - v0.7.0
-    ( [README](https://github.com/dahlbyk/posh-git/blob/v0.7.0/README.md)
-    • [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/v0.7.0/CHANGELOG.md) )
+
+### posh-git v0.x
+
+[![v0 build status](https://ci.appveyor.com/api/projects/status/eb8erd5afaa01w80/branch/v0?svg=true&pendingText=v0%20%E2%80%A3%20pending&failingText=v0%20%E2%80%A3%20failing&passingText=v0%20%E2%80%A3%20passing)](https://ci.appveyor.com/project/dahlbyk/posh-git/branch/v0)
+[![v0 build coverage](https://coveralls.io/repos/github/dahlbyk/posh-git/badge.svg?branch=v0)](https://coveralls.io/github/dahlbyk/posh-git?branch=v0)
+( [README](https://github.com/dahlbyk/posh-git/blob/v0/README.md)
+• [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/v0/CHANGELOG.md) )
+
+- Supports Windows PowerShell 3+
+- Does not support PowerShell Core
+- Avoids breaking changes, maintaining v0.x
+
+#### Releases
+
+- v0.7.3
+  ( [README](https://github.com/dahlbyk/posh-git/blob/v0.7.3/README.md)
+  • [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/v0.7.3/CHANGELOG.md) )
+- v0.7.1
+  ( [README](https://github.com/dahlbyk/posh-git/blob/v0.7.1/README.md)
+  • [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/v0.7.1/CHANGELOG.md) )
+- v0.7.0
+  ( [README](https://github.com/dahlbyk/posh-git/blob/v0.7.0/README.md)
+  • [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/v0.7.0/CHANGELOG.md) )
+
+### posh-git v1.0
+
+[![master build status](https://ci.appveyor.com/api/projects/status/eb8erd5afaa01w80/branch/master?svg=true&pendingText=master%20%E2%80%A3%20pending&failingText=master%20%E2%80%A3%20failing&passingText=master%20%E2%80%A3%20passing)](https://ci.appveyor.com/project/dahlbyk/posh-git/branch/master)
+[![master build coverage](https://coveralls.io/repos/github/dahlbyk/posh-git/badge.svg?branch=master)](https://coveralls.io/github/dahlbyk/posh-git?branch=master)
+( [README](https://github.com/dahlbyk/posh-git/blob/master/README.md)
+• [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/master/CHANGELOG.md) )
+
+- Supports Windows PowerShell 5.x
+- Supports PowerShell Core 6+ on all platforms
+- Supports [ANSI escape sequences](https://en.wikipedia.org/wiki/ANSI_escape_code) for color customization
+- Includes breaking changes from v0.x ([roadmap](https://github.com/dahlbyk/posh-git/issues/328))
+
+#### Releases
+
+- v1.0.0
+  ( [README](https://github.com/dahlbyk/posh-git/blob/v1.0.0/README.md)
+  • [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/v1.0.0/CHANGELOG.md) )
+- v1.0.0-beta2
+  ( [README](https://github.com/dahlbyk/posh-git/blob/v1.0.0-beta2/README.md)
+  • [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/v1.0.0-beta2/CHANGELOG.md) )
+- v1.0.0-beta1
+  ( [README](https://github.com/dahlbyk/posh-git/blob/v1.0.0-beta1/README.md)
+  • [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/v1.0.0-beta1/CHANGELOG.md) )
 
 ## Notes
 posh-git adds variables to your session to let you customize it, including `$GitPromptSettings`, `$GitTabSettings`, and `$TortoiseGitSettings`.

appveyor.yml

@@ -7,8 +7,8 @@ environment:
 
 branches:
   only:
-    - develop
     - master
+    - v0
 
 init:
   - git config --global core.autocrlf true

chocolatey/poshgit.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>poshgit</id>
     <title>posh-git</title>
-    <version>1.0.0-beta1</version>
+    <version>1.0.0-beta1x</version>
     <authors>Keith Dahlby, Mark Embling, Jeremy Skinner, Keith Hill</authors>
     <owners>Keith Dahlby</owners>
     <description>### posh-git
@@ -27,7 +27,7 @@ Note on performance: displaying file status in the git prompt for a very large r
     <summary>Provides prompt with Git status summary information and tab completion for Git commands, parameters, remotes and branch names.</summary>
     <tags>poshgit posh-git powershell git</tags>
     <projectUrl>https://github.com/dahlbyk/posh-git</projectUrl>
-    <licenseUrl>https://github.com/dahlbyk/posh-git/blob/develop/LICENSE.txt</licenseUrl>
+    <licenseUrl>https://github.com/dahlbyk/posh-git/blob/master/LICENSE.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
       <dependency id="chocolatey" version="0.9.10" />

src/posh-git.psd1

@@ -4,7 +4,7 @@
 RootModule = 'posh-git.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.0.0'
+ModuleVersion = '1.0.0.0'
 
 # ID used to uniquely identify this module
 GUID = '74c9fd30-734b-4c89-a8ae-7727ad21d1d5'
@@ -66,13 +66,13 @@ PrivateData = @{
         Tags = @('git', 'prompt', 'tab', 'tab-completion', 'tab-expansion', 'tabexpansion', 'PSEdition_Core')
 
         # A URL to the license for this module.
-        LicenseUri = 'https://github.com/dahlbyk/posh-git/blob/develop/LICENSE.txt'
+        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'
 
         # ReleaseNotes of this module
-        ReleaseNotes = 'https://github.com/dahlbyk/posh-git/blob/develop/CHANGELOG.md'
+        ReleaseNotes = 'https://github.com/dahlbyk/posh-git/blob/master/CHANGELOG.md'
 
         # OVERRIDE THIS FIELD FOR PUBLISHED RELEASES - LEAVE AT 'alpha' FOR CLONED/LOCAL REPO USAGE
         Prerelease = 'beta1x'