From: Glenn Rempe Date: Sat, 19 Jul 2008 00:19:24 +0000 (-0700) Subject: Git 'dashed' commands are deprecated and no longer available with new installs from... X-Git-Url: https://repo.or.cz/git-blog.git/commitdiff_plain/54d078bfee693398a1011874257020ad7a6fdd59 Git 'dashed' commands are deprecated and no longer available with new installs from source. The non-dashed versions have been working for a while and this should be transparent. --- diff --git a/README.mkdn b/README.mkdn index d02e266..1839289 100644 --- a/README.mkdn +++ b/README.mkdn @@ -3,7 +3,7 @@ git-blog git-blog intends to be blogging, simplified. You'll write your posts in your favorite text editor, with your favorite markup. Then save the post's file, -`git-add` the post, and then `git-push origin master`. git-blog, running on +`git add` the post, and then `git push origin master`. git-blog, running on your server, will catch the push and parse the post to your static HTML blog. Fast, no dynamic code being run on every load, free post versioning (git revisions), free sections (git branches), freedom of mind. @@ -13,7 +13,7 @@ Philosophy & goals git-blog will never be featureful, but it will also never be bloated. I doubt I will ever do anything more than parsing the posts to static HTML on every -git-push. +`git push`. Preparing git-blog ------------------ @@ -24,7 +24,7 @@ To prepare a new git-blog, run this task from the cloned git-blog repository, re After this is complete, move to that folder (something along the lines of `cd ~/Documents/Blog`), and then add any remote repositories to which you wish to push your blog. Most likely, this will include the server hosting your blog to the web. The simplest setup to push to this server is an SSH connection - if you have SSH access to your server/host, you can run this to set up git-blog for pushing: - git-remote add blog username@host.tld:/path/to/server/blog/folder + git remote add blog username@host.tld:/path/to/server/blog/folder This will prepare a remote named 'blog' to which you can push your changes. In addition, if you use [GitHub](http://github.com "GitHub - free Git repository hosting"), you can also push your blog there. Create a new repository on GitHub, and then use this to automatically set up that remote for you: @@ -45,11 +45,11 @@ Once you've finished editing your post, save it, and close the window or exit th Now just push your beautiful new post(s) to the server: - git-push blog + git push blog I suggest you run `rake deploy` before comitting any new posts / changes to post - if you have a syntax error in one of your posts, the parser may not like it, and it's preferable to catch this before you commit the changes and push them to your blog. -git-blog will automatically re-parse all of your posts, and create an index file for your blog, after you git-push to the server. They're going to end up as simple static HTML, so there's nearly no load on your server when a page is visited - this makes a git-blog inherently faster and cheaper to run than any dynamic blog (such as Wordpress or Expression Engine) could ever be. +git-blog will automatically re-parse all of your posts, and create an index file for your blog, after you `git push` to the server. They're going to end up as simple static HTML, so there's nearly no load on your server when a page is visited - this makes a git-blog inherently faster and cheaper to run than any dynamic blog (such as Wordpress or Expression Engine) could ever be. Customizing git-blog -------------------- diff --git a/lib/git-blog.rb b/lib/git-blog.rb index 1330a18..12822c0 100644 --- a/lib/git-blog.rb +++ b/lib/git-blog.rb @@ -53,8 +53,8 @@ task :github, :user_name, :repo_name do |_, params| github = blog.add_remote 'github', github_url blog.push github else - system "git-init" - system "git-remote add -f github #{github_url}" + system "git init" + system "git remote add -f github #{github_url}" system "git checkout -b master github/master" end end @@ -196,7 +196,7 @@ end # desc 'Invisible task, forces checkout (for the post-receive hook)' task :force_checkout do puts 'Forcing update of working copy...' - system 'git-checkout -f master' + system 'git checkout -f master' end # desc 'Invisible task, run as the post-receive hook'