Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update develop from master #517

Merged
merged 25 commits into from
Jan 1, 2018
Merged

Update develop from master #517

merged 25 commits into from
Jan 1, 2018

Conversation

dahlbyk
Copy link
Owner

@dahlbyk dahlbyk commented Jan 1, 2018

Going to cut a v0.7.2 release from here, too.

duncansmart and others added 25 commits November 10, 2017 16:05
@duncansmart
Directory names that contain [brackets] cause GitPrompt to fail
44e8583 
Using `Get-Item -LiteralPath` means that "[brackets]" don't get interpreted as wildcards.
@dahlbyk
Merge pull request #502 from duncansmart/patch-1
65658bf 
Directory names that contain [brackets] cause GitPrompt to fail
@dahlbyk
Add Add-PoshGitToProfile -AllUsers support
f252031
@bergmeister @dahlbyk
Fix duplicated tab completion of branches that exist locally and on t…
4dac43f 
…he remote (issue
@bergmeister @dahlbyk
use select-object because of performance and to keep order of arrays …
82b84c4 
…the same and the arrays themselves are already ordered
@bergmeister @dahlbyk
Make comment start with an upper case letter to poke the hanging PR b…
111b59a 
…uild
@bergmeister @dahlbyk
Optimise git checkout completion fix by working in pipeline to avoid …
42e31cc 
…creating temporary arrays.
@bergmeister @dahlbyk
Cleanup unnecessary array syntax
d96a350
@dahlbyk
Merge pull request #512 from dahlbyk/gh505
4e95488 
Fix duplicate branch names
@dahlbyk
Extract Test-Administrator helper
9819b07
@dahlbyk
Add elevated user error for -AllUsers
557f47e
@dahlbyk
Merge branch 'master' into AllUsers
0a2dd63
@rkeithhill
Fix #500 errors generated by Add-Member
364aa25 
This adds the -Force paramteter as recommended by the error message.
@rkeithhill
Update tasks.json to 2.0.0 schema and pwsh
c7a8261
@rkeithhill
Clean up wording for work dir local status
c9402bd
@rkeithhill
Undo change that shouldn't be part of this PR
9bb813b
@rkeithhill
Merge pull request #515 from dahlbyk/rkeithhill/update-tasks-json
0b7a485 
Update tasks.json to 2.0.0 schema and pwsh
@rkeithhill
Merge branch 'master' into rkeithhill/fix-status-legend
464ff69
@rkeithhill
Merge branch 'master' into rkeithhill/fix-add-member-err-master
ae3603d
@dahlbyk
Merge pull request #514 from dahlbyk/rkeithhill/fix-add-member-err-ma…
2ecf05a 
…ster

Fix #500 errors generated by Add-Member
@dahlbyk
Adjust AllUsers elevated host error message
76d52f5
@dahlbyk
Merge branch 'master' into AllUsers
08d73ec
@dahlbyk
Merge pull request #504 from dahlbyk/AllUsers
bf0ec4a 
Add `Add-PoshGitToProfile -AllUsers` support
@dahlbyk
Merge branch 'master' into rkeithhill/fix-status-legend
bd06c5f
@dahlbyk
Merge pull request #516 from dahlbyk/rkeithhill/fix-status-legend
fc692c5 
Clean up wording for work dir local status
dahlbyk added a commit that referenced this pull request Jan 1, 2018
@dahlbyk
Merge pull request #517 from dahlbyk/master
84d8635 
Update develop from master
@dahlbyk dahlbyk merged commit fc692c5 into develop Jan 1, 2018
dahlbyk added a commit that referenced this pull request Jan 1, 2018
@dahlbyk
Merge pull request #517 from dahlbyk/master
1e9c231 
Update develop from master
@rkeithhill
Copy link
Collaborator

Cool. I'll need to rebase #513 to get it onto these changes.

@dahlbyk
Copy link
Owner Author

dahlbyk commented Jan 1, 2018 •
edited
Loading

Pay no attention to the fact that I tried to close this without updating my local master. 😏

Cool. I'll need to rebase #513 to get it onto these changes.

👍 Going to close #472 so you don't have to keep both up-to-date.

Update: I meant #499, which you just closed.

@dahlbyk dahlbyk added this to the v1.0 milestone Apr 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.0
Development

Successfully merging this pull request may close these issues.
4 participants
@dahlbyk @rkeithhill @duncansmart @bergmeister