cd /path/to/your/forked/repo
git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git
git fetch upstream
git merge upstream branch_name
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
node_modules |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
.tmp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
function errorHandler(res) { | |
return function(err) { | |
res.send(400).send(err); | |
} | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<h2>SVG animation demo.</h2> | |
<svg xmlns:xlink="http://www.w3.org/1999/xlink" id="james-pogi-lol" image-rendering="auto" baseProfile="basic" version="1.1" x="0px" y="0px" width="200" height="170" overflow="visible" xmlns="http://www.w3.org/2000/svg"><g><g id="Tween_13" transform="matrix(1 0 0 1 69.65 56.95)" opacity="1"><animateTransform attributeName="transform" additive="replace" type="translate" dur="0.967s" keyTimes="0;0.034;0.069;0.103;0.138;0.172;0.207;0.241;0.276;0.31;0.345;0.379;0.414;1" values="49.65,36.95;50.3,37.6;52.2,39.5;55.35,42.65;59.75,47.05;65.45,52.75;66.55,53.85;67.5,54.8;68.3,55.6;68.9,56.2;69.3,56.6;69.55,56.85;69.65,56.95;69.65,56.95" calcMode="discrete"/><animate attributeName="opacity" dur="0.967s" keyTimes="0;0.034;0.069;0.103;0.138;0.172;0.207;0.241;0.276;0.31;0.345;0.379;0.414;1" values="0;0.01;0.05;0.12;0.22;0.34;0.52;0.66;0.79;0.88;0.95;0.99;1;1" calcMode="discrete"/><path fill="#292929" d="M26.15,-25.5L-1.15,-25.5 -26.15,17.5 -21.5,25.5 -1.95,25.5 26.15,-25.5"/></g></g><g><g id= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/** assuming you have these in your <body> | |
<input id="textfield"></input> | |
<div id="container"></div> | |
**/ | |
var container = $('#container'); | |
var template = '<div><input></input></div>'; | |
var i = $('input#textfield').attr('id'); | |
i = parseInt(i); | |
while(i-- > 0){ | |
container.append(template); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
class Humanoid | |
attack: (target) -> | |
target.hp -= @damage | |
class Elf extends Humanoid | |
attack: (target) -> | |
super() | |
target.hp -= @magicBonus |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
class Wol.Views.Marine extends Wol.Views.UnitView | |
init: -> | |
image = @model.getAsset 'marine' | |
frameData = FrameData.marine | |
frameData.images = [image] | |
spriteSheet = new SpriteSheet frameData | |
@animation = new BitmapAnimation spriteSheet | |
@el.addChild @animation | |
super() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
class Humanoid | |
attack: (target) -> | |
target.hp -= @damage | |
class Elf extends Humanoid | |
attack: (target) -> | |
super() | |
target.hp -= @magicBonus |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
" Configuration file for vim | |
set modelines=0 " CVE-2007-2438 | |
" Normally we use vim-extensions. If you want true vi-compatibility | |
" remove change the following statements | |
set nocompatible " Use Vim defaults instead of 100% vi compatibility | |
set backspace=2 " more powerful backspacing | |
" Don't write backup file if vim is being called by "crontab -e" | |
au BufWrite /private/tmp/crontab.* set nowritebackup |
OlderNewer