42¢ glxn.net

Keeping gh-pages branch in sync with master

For github project pages that are simply websites hosted on github pages like this one I have found it a bit annoying to constantly merge master with gh-pages branch. I could simply stay on the gh-pages branch ignoring master, but I really prefer to work on master. Guess It’s a small OCD tendency I have..

git shove

There are a number of ways to solve this. Like a git commit hook that merges, followed by a push —all. But I prefer setting an alias for it:

[alias]
    shove = !git push origin master && git push origin master:gh-pages

Now all I have to to to push both master and gh-pages while keeping them in sync is just to do a normal commit followed by git shove:

   (master) $ git ci -m "updated post"
[master b6806c3] updated post
 1 file changed, 18 insertions(+), 1 deletion(-)
   (master) $ git shove
Counting objects: 7, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 822 bytes, done.
Total 4 (delta 2), reused 0 (delta 0)
To git@github.com:kenglxn/42cents.git
   e570bf9..b6806c3  master -> master
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:kenglxn/42cents.git
   e570bf9..b6806c3  master -> gh-pages

comments powered by Disqus

Moar stuffs

07 Jun 2015 Deploy an Ember app to gh-pages using npm run-script
06 Jun 2015 JSON Contract testing using unit tests to assert full stack integration across REST services
03 May 2015 simple http serve a directory from terminal
07 Jan 2014 civu, a CLI for cloning git repositories from jenkins views
06 Jan 2014 PyramidSort, a Sublime Text plugin for for reformatting text
05 Jan 2014 Git commit-message hook for JIRA issue tags
31 May 2013 hacking kitchen tiles with coffeescript
30 May 2013 Nuke, ps grep kill something
24 May 2013 mvnr: recursive mvn command runner
23 May 2013 Query By Example for JPA
22 May 2013 gitr: recursive git command runner
21 May 2013 Keeping gh-pages branch in sync with master
19 May 2013 Migrated from wordpress to jekyll and github pages
14 Aug 2012 Using Sublime Text 2 as git commit message editor
10 Mar 2012 QRGen, a small wrapper on top of ZXING for generating QRCodes in java
04 Jan 2012 My Bash PS1 with git branch info
17 Aug 2010 Making a swing project using IntelliJ IDEA GUI builder with maven, Including executable jar
01 May 2010 Using Arquillian to test against a remote jboss container from within IDEA
06 Apr 2010 WELD/CDI lightningtalk from Know IT 2010 annual conference
03 Apr 2010 Solving Sudoku using java swing and junit
01 Mar 2010 Simple CDI/WELD login example
01 Mar 2010 Implementing @RequestParam in CDI/WELD using Qualifier and InjectionPoint as @HttpParam
01 Nov 2009 Seam Maven Refimpl