chrisjacob

Intro

Description: Setup GitHub Pages "gh-pages" branch and "master" branch as subfolders of a parent project folder ("grandmaster").

Author: Chris Jacob @_chrisjacob

Tutorial (Gist): https://gist.github.com/833223

The Result

cwarden

require "try-catch"

try {
   function()
      error('oops')
   end,

   catch {
      function(error)
         print('caught error: ' .. error)

gre

{
    "ease":        [0.25, 0.1, 0.25, 1.0], 
    "linear":      [0.00, 0.0, 1.00, 1.0],
    "ease-in":     [0.42, 0.0, 1.00, 1.0],
    "ease-out":    [0.00, 0.0, 0.58, 1.0],
    "ease-in-out": [0.42, 0.0, 0.58, 1.0]
}

OnesimusUnbound

[T]he difference between a bad programmer and a 
good one is whether he considers his code or his 
data structures more important. Bad programmers 
worry about the code. Good programmers worry about 
data structures and their relationships. 
-- Linus Torvalds
~~~
Clarity and brevity sometimes are at odds. 
When they are, I choose clarity. 
-- Jacob Kaplan-Moss

alexeds

Move your stashes from one repo to another

---

This was useful for me when we created a new branch for a new major release, but were still working on our current version as well. I cloned our repo again and kept the new project on our new branch, but also wanted to get my stashes there.

Download your stashes

git stash show -p > patch

You'll have to specify your stash and name your file whatevery you want. Do this for as all your stashes, and you'll have patch files in your pwd.

wildmichael

This is some ^superscript text.

vemacs

Alblaka removes compatibility between Too Many Items and BuildCraft by request of Direwolf20
SpaceToad plays OpenPeripheral on Twitch
MachineMuse confirms that OpenBlocks should be less like Chisel
kirindave threatens to complain about Shukaro until they remove Natura from Resonant Rise
nallar adds compatibility between ExtraBiomesXL and VoxelMap by request of kakermix
Sengir denies OpenPeripheral is faster than RedPower 3
MamiyaOtaru steals code from Highlands
Alblaka decides to base their entire modpack on Pixelmon
Vswe says PowerCrystals did not steal 5 lines of code from RealSketch
RWTema tweets tgame14 stole 5 lines of code from Reika

unbracketed

Example: Moving up to a few commits to another branch

Branch A has commits (X,Y) that also need to be in Branch B. The cherry-pick operations should be done in the same chronological order that the commits appear in Branch A.

cherry-pick does support a range of commits, but if you have merge commits in that range, it gets really complicated

git checkout branch-B
git cherry-pick X
git cherry-pick Y

bkaradzic

Orthodox C++

What is Orthodox C++?

Orthodox C++ (sometimes referred as C+) is minimal subset of C++ that improves C, but avoids all unnecessary things from so called Modern C++. It's exactly opposite of what Modern C++ suppose to be.

Why not Modern C++?

nutti

# ##### BEGIN GPL LICENSE BLOCK #####
#
#  This program is free software; you can redistribute it and/or
#  modify it under the terms of the GNU General Public License
#  as published by the Free Software Foundation; either version 2
#  of the License, or (at your option) any later version.
#
#  This program is distributed in the hope that it will be useful,
#  but WITHOUT ANY WARRANTY; without even the implied warranty of
#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the