Merge branch 'master' of github.com:imathis/octopress

This commit is contained in:
Brandon Mathis 2012-08-03 16:03:41 -05:00
commit a96c0c6257

View File

@ -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'