Skip to content

Commit

Permalink
Updated Readme for new setup command options for local and enterprise
Browse files Browse the repository at this point in the history
  • Loading branch information
Valentino committed Oct 15, 2013
1 parent 8a79ffd commit 6822f78
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 16 additions & 0 deletions README.rdoc
Expand Up @@ -85,6 +85,22 @@ It looks like this:

This is safe to run multiple times. We don't care.

=== Usage with Github Enterprise
To use GitReflow with a GitHub Enterprise account, there are some additional switches available to the GitReflow setup command. You should be able to use GitReflow for both your Enterprise and non-Enterprise repositories. Because of this, there are a few scenarios that may apply to your usage of GitReflow:

You use a GitHub Enterprise account for the majority of your repositories:
git reflow setup --enterprise
After this, anytime you want to use GitReflow with project that uses a regular GitHub account:
cd replace_with_your_non_enterprise_project_path
git reflow setup --local
This will setup your project's git config with the OAuth token generated from the credentials you provide

If you only use GitHub Enterprise for a select few repositories, you'll first want to setup GitReflow as normal:
git reflow setup
Then for your Enterprise projects, you have to setup GitReflow for each one:
cd replace_with_your_enterprise_project_path
git reflow setup --enterprise --local

=== Starting a feature branch
git reflow start

Expand Down
2 changes: 1 addition & 1 deletion lib/git_reflow.rb
Expand Up @@ -118,7 +118,7 @@ def deliver(options = {})
has_comments = has_pull_request_comments?(existing_pull_request)

# if there any comment_authors left, then they haven't given a lgtm after the last commit
if (has_comments and open_comment_authors.empty?) or options['skip-lgtm']
if (has_comments and open_comment_authors.empty?) or options['skip_lgtm']
lgtm_authors = comment_authors_for_pull_request(existing_pull_request, :with => LGTM)
commit_message = existing_pull_request[:body] || get_first_commit_message
puts "Merging pull request ##{existing_pull_request.number}: '#{existing_pull_request.title}', from '#{existing_pull_request.head.label}' into '#{existing_pull_request.base.label}'"
Expand Down

0 comments on commit 6822f78

Please sign in to comment.