https://playground.christian-gmeiner.info/tags/github/ Recent content in Github on Christian Gmeiner https://playground.christian-gmeiner.info/papermod-cover.png https://playground.christian-gmeiner.info/papermod-cover.png Hugo -- 0.152.2 en-us Thu, 20 Feb 2014 08:15:19 +0000 https://playground.christian-gmeiner.info/2014-02-20-github-how-to-download-a-change-as-patch/ Thu, 20 Feb 2014 08:15:19 +0000 https://playground.christian-gmeiner.info/2014-02-20-github-how-to-download-a-change-as-patch/ <p>Sometimes I can be useful to download a changes contained in a Github pull request as a unified diff. It turns out to be very easy.  To view a commit as a diff/patch file, just add <code>.diff</code> or <code>.patch</code> to the end of the URL</p> <p><a href="https://github.com/austriancoder/etna_viv/commit/568d290514b6e61428bb73281ac596b0404c8f70.patch">For instance</a> <a href="https://github.com/austriancoder/etna_viv/commit/568d290514b6e61428bb73281ac596b0404c8f70.patch"> </a></p> https://playground.christian-gmeiner.info/2014-02-08-rebase-github-fork/ Sat, 08 Feb 2014 09:37:49 +0000 https://playground.christian-gmeiner.info/2014-02-08-rebase-github-fork/ <p>Today I needed to rebase my etnaviv fork to the current master of upstream. I need to say that I never did this before but with git this is a breeze.</p> <div class="oembed-gist"><script src="https://gist.github.com/austriancoder/724a0a8d1db4f229e197d501f8b49fa5.js"></script><noscript>View the code on [Gist](https://gist.github.com/austriancoder/724a0a8d1db4f229e197d501f8b49fa5).</noscript></div>If you get a merge conflict during rebase, you only need to follow the instructions git gives you.