Skip to content

Update develop from master#437

Merged
dahlbyk merged 23 commits intodevelopfrom
update-from-master
Feb 27, 2017
Merged

Update develop from master#437
dahlbyk merged 23 commits intodevelopfrom
update-from-master

Conversation

@dahlbyk
Copy link
Copy Markdown
Owner

@dahlbyk dahlbyk commented Feb 22, 2017

Getting out ahead of conflicts between #436 and #427.

dahlbyk and others added 23 commits February 17, 2017 08:55
Update README regarding develop branch
Limit master build badge to master
Various v0.7.1 adjustments
Currently, if there is no key file, posh-git's Start-SshAgent runs pageant twice which causes pageant to show an error dialog about already running. This simple change stops that happening.
Don't rerun pageant if there are no keys to add
Either we'll keep Chocolatey support for 1.0 and handle
profile.example.ps1 gracefully, or we'll never release a version that
doesn't include the file (so the warning is meaningless).
Hide profile.example.ps1 warning for Chocolatey
Actually check current prompt against legacy prompt
@dahlbyk dahlbyk merged commit 79fc86f into develop Feb 27, 2017
@dahlbyk dahlbyk deleted the update-from-master branch February 27, 2017 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants