Skip to content

Fixing Refresh to take in parameter for "base" instead of "branch"#169

Merged
codenamev merged 1 commit intoreenhanced:masterfrom
simonzhu24:sz/naming-bug-fix
May 3, 2016
Merged

Fixing Refresh to take in parameter for "base" instead of "branch"#169
codenamev merged 1 commit intoreenhanced:masterfrom
simonzhu24:sz/naming-bug-fix

Conversation

@simonzhu24
Copy link
Copy Markdown
Contributor

No description provided.

@simonzhu24
Copy link
Copy Markdown
Contributor Author

@codenamev can we merge this?

refresh_options = {
:remote => options[:remote],
:branch => options[:branch]
:base => options[:base]
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

don't you need to update something in update_feature_branch as well?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Wow. good catch!

@simonzhu24 simonzhu24 force-pushed the sz/naming-bug-fix branch 2 times, most recently from 081e9db to b107c9e Compare May 2, 2016 21:09
Comment thread lib/git_reflow/commands/refresh.rb Outdated
c.flag [:b,:base], default_value: 'master'
c.action do |global_options, options, args|
# usage: git reflow refresh [remote_location - defaults to origin] [base_branch_name - defaults to master]
# usage: git reflow refresh -r [remote_location - defaults to origin] -b [base_branch_name - defaults to master]
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

The primary advantage of using a gem like gli is that it adds documentation with its syntax. We have a task to add documentation for the code which is where something like this would be better suited to live. I'd still like to see the comments removed here.

@simonzhu24 simonzhu24 force-pushed the sz/naming-bug-fix branch from b107c9e to 89088f5 Compare May 3, 2016 15:07
@simonzhu24
Copy link
Copy Markdown
Contributor Author

@codenamev Fixed. Please let me know when you have a chance to review!

@codenamev
Copy link
Copy Markdown
Collaborator

LGTM, thanks!

@codenamev codenamev merged commit 2888907 into reenhanced:master May 3, 2016
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