Skip to content

Commit

Permalink
Merge branch 'master' of github.com:imathis/octopress
Browse files Browse the repository at this point in the history
  • Loading branch information
imathis committed Aug 3, 2012
2 parents 471f22a + 55553a6 commit 2a2cad4
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Rakefile
Expand Up @@ -299,7 +299,9 @@ task :setup_github_pages, :repo do |t, args|
if args.repo
repo_url = args.repo
else
repo_url = get_stdin("Enter the read/write url for your repository: ")
puts "Enter the read/write url for your repository"
puts "(For example, 'git@github.com:your_username/your_username.github.com)"
repo_url = get_stdin("Repository url: ")
end
user = repo_url.match(/:([^\/]+)/)[1]
branch = (repo_url.match(/\/[\w-]+.github.com/).nil?) ? 'gh-pages' : 'master'
Expand Down

0 comments on commit 2a2cad4

Please sign in to comment.