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

Easy-to-Merge #2922

Merged
merged 4 commits into from
Aug 31, 2014
Merged

Easy-to-Merge #2922

merged 4 commits into from
Aug 31, 2014

Conversation

ncanceill
Copy link
Contributor

Easy to Merge

This branch collects PRs that are easy to merge, like fixing typos and such. If you want to add a commit, please submit a PR to my branch.

Status

Collecting more and more PRs before merging. Please help.

This is the second Easy-to-Merge PR: see #2827

Changelog

@Kriechi
Copy link
Contributor

Kriechi commented Jul 2, 2014

How about #2845 #2834 #2745 #2670 #1818 ?

Maybe #2923 if someone approves it.

@ncanceill
Copy link
Contributor Author

Thanks for the pointers!

Let us not confuse things though: #2923 is a super-PR on its own, and with 9 commits adding 52 lines already, it is not an easy merge. Similarly, we do not want commits to be duplicated: I will remove #2885 and leave out #1818 because they belong in #2923.

@ncanceill ncanceill mentioned this pull request Jul 9, 2014
Closed
@Kriechi
Copy link
Contributor

Kriechi commented Jul 10, 2014

#2157 and #2745 somehow do the same, but only one can be merged (please mark the other one to be closed automatically)

@Kriechi
Copy link
Contributor

Kriechi commented Jul 10, 2014

With a simple rebase #1220 should fit in here.

@ncanceill
Copy link
Contributor Author

Pulled #1220, and #2745 was already in there, I simply referenced #2157 for closing (bup is a backup command-line utility based on git).

This was referenced Jul 15, 2014
Closed
Closed
Markus Faerevaag and others added 4 commits July 16, 2014 12:27
@ncanceill
[wd] v0.2.2: Added MIT-License
a6b655f
@ncanceill
Revert "specify python2 in shebang"
5756ea0 
"/usr/bin/python2" does not exist on Mac OSX (see ohmyzsh#2382), so fuck people who have
"python" symlinked to "python3"

This reverts commit e5ed07e
@ncanceill
make sure cache dir exists, just like log dir
7478b75
@gizmomogwai @ncanceill
gem plugin: added _files to install command
39a1e2a 
is useful if you want to install a local gem from the filesystem
@Kriechi
Copy link
Contributor

Kriechi commented Jul 19, 2014

@ncanceill I think Robby does not want any additional license files being around in the plugin folders.

#2845 (comment) and #2821 (comment)

@Kriechi Kriechi mentioned this pull request Jul 19, 2014
Closed
@mcornella
Copy link
Member

Nicolas, #2431 is still pending to be merged too

@mcornella mcornella mentioned this pull request Jul 27, 2014
Merged
robbyrussell added a commit that referenced this pull request Aug 31, 2014
@robbyrussell
Merge pull request #2922 from ncanceill/easymerge
3e30b4d 
Easy-to-Merge via @ncanceill... our hero!
@robbyrussell robbyrussell merged commit 3e30b4d into ohmyzsh:master Aug 31, 2014
@mcornella mcornella mentioned this pull request Dec 15, 2014
Closed
@ncanceill ncanceill deleted the easymerge branch April 25, 2015 10:39
@ncanceill ncanceill mentioned this pull request Apr 25, 2015
Merged
@robbyrussell robbyrussell mentioned this pull request Aug 9, 2016
Closed
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
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ncanceill @Kriechi @mcornella @robbyrussell @gizmomogwai