http://www.robbyonrails.com/articles/2008/08/29/git-push-it-real-good en-us 40 thoughts.sort_by{|t| t[:topic]}.collect <p>After wrestling with some git-remote-branching-merge-problems&#8230; I remembered this song&#8230;</p> <object width="425" height="344"><param name="movie" value="http://www.youtube.com/v/BCV5yGKWjv4&#38;hl=en&#38;fs=1"></param><param name="allowFullScreen" value="true"></param><embed src="http://www.youtube.com/v/BCV5yGKWjv4&#38;hl=en&#38;fs=1" type="application/x-shockwave-flash" allowfullscreen="true" width="425" height="344"></embed></object> <p>If you&#8217;re using git, you might add this to your <code>[alias]</code> section in <code>.gitconfig</code>.</p> <p>(notice the <code>up-on-this</code> alias)</p> <script src="http://gist.github.com/8076.js"></script> Fri, 29 Aug 2008 13:23:00 -0500 urn:uuid:42e811b4-d61b-4c43-8500-a792c9780c8e Robby Russell http://www.robbyonrails.com/articles/2008/08/29/git-push-it-real-good git video