Skip to content

Add addtional CLI option --branch-from #24

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.

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

Merged
merged 1 commit into from
Nov 18, 2016
Merged

Conversation

worace
Copy link
Contributor

@worace worace commented May 24, 2016

This supports a little more flexibility in which
branches can be used for deploying and building.

Specifically, it lets a user build from some non-master
branch and push to a master branch, which is useful
if you're deploying to the standard myname.github.io.

Example:

jgd --branch master --branch-from source

@worace
Copy link
Contributor Author

worace commented May 24, 2016

Hey there -- Thanks for this gem -- found it pretty helpful but i discovered i needed a little more flexibility around which branches i could push to / from.

This change got it working for me the way i wanted so happy to share it back with you if you think others would find it interesting.

@davvd
Copy link
Collaborator

davvd commented May 24, 2016

@worace Thanks for the pull request, let me find a reviewer..

@davvd davvd added CR labels May 24, 2016
@xx7y7xx
Copy link

xx7y7xx commented Sep 8, 2016

@worace already fixed in #19?

@worace
Copy link
Contributor Author

worace commented Sep 8, 2016

@xxd3vin i think that is similar but if I understand correctly doesn't let you specify both custom target and source branches? so in the current case you could specify to build to a custom branch but it would always build from gh-pages?

@xx7y7xx
Copy link

xx7y7xx commented Sep 9, 2016

@worace I'm sorry, you are right, I think I misunderstood you.

I look into this commit, it's OK.

@xx7y7xx
Copy link

xx7y7xx commented Sep 9, 2016

@davvd Where is the code reviewer?

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
s.rubygems_version = '2.2.2'
s.required_ruby_version = '>= 1.9.3'
s.name = 'jgd'
s.version = '2.0.snapshot'
s.version = '2.1.0'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@worace please, put it back. it should be 2.0.snapshot

@yegor256
Copy link
Owner

yegor256 commented Sep 9, 2016

@worace I made one comment to the PR, please check it

This supports a little more flexibility in which
branches can be used for deploying and building.

Specifically, it lets a user build from some non-master
branch and push to a master branch, which is useful
if you're deploying to the standard myname.github.io.

Example:

jgd --branch master --branch-from source
@worace
Copy link
Contributor Author

worace commented Sep 11, 2016

@yegor256 thanks for taking a look! I put the version back and also went ahead and squashed my commits into 1

@davvd
Copy link
Collaborator

davvd commented Sep 12, 2016

@davvd Where is the code reviewer?

@xxd3vin still looking for one...

@davvd
Copy link
Collaborator

davvd commented Sep 12, 2016

@yegor256 review this pls (it's a rather short pull request)

@yegor256
Copy link
Owner

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Nov 18, 2016

@rultor merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here

@rultor rultor merged commit e0bf376 into yegor256:master Nov 18, 2016
@yegor256
Copy link
Owner

@rultor release, tag is 1.8

@rultor
Copy link
Collaborator

rultor commented Nov 18, 2016

@rultor merge

@yegor256 Done! FYI, the full log is here (took me 2min)

@rultor
Copy link
Collaborator

rultor commented Nov 18, 2016

@rultor release, tag is 1.8

@yegor256 OK, I will release it now. Please check the progress here

@rultor
Copy link
Collaborator

rultor commented Nov 18, 2016

@rultor release, tag is 1.8

@yegor256 Done! FYI, the full log is here (took me 2min)

@davvd davvd added CR labels Nov 21, 2016
@davvd
Copy link
Collaborator

davvd commented Nov 22, 2016

@yegor256 done, I added 19 mins in payment 000-189fbf0c, 1679 hours and 17 mins spent to complete this... extra minutes for review comments (c=4)... added +19 to your rating, now it is equal to +68

@davvd
Copy link
Collaborator

davvd commented Nov 22, 2016

@rultor deploy

@rultor
Copy link
Collaborator

rultor commented Nov 22, 2016

@rultor deploy

@davvd OK, I'll try to deploy now. You can check the progress here

@rultor
Copy link
Collaborator

rultor commented Nov 22, 2016

@rultor deploy

@davvd Done! FYI, the full log is here (took me 1min)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants