Workflows!
Internals!
Tips & Tricks!
Resolving conflicts!
Reading git output!
This file contains hidden or 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
import {Component} from 'angular' | |
import {template} from 'chat/message/item-template'; | |
@Inject(['ChatActions', 'MessageStore']) | |
@Component({selector: 'messageItem', bindAs: 'state', template: template}) | |
@IsolateScope({query: 'query'}) | |
export class MessageItem { | |
constructor(Actions: ChatActions, Store: MessageStore}) { | |
this._Actions = Actions; |
This file contains hidden or 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
angular.module('trkstr.player.actions', [ | |
'songFlux' | |
]).factory('PlayerActions', function(songFactory){ | |
function Action(){ | |
this.module = this.module || 'trkstr'; | |
this.dispatcher = songFactory.getDispatcher(this.module); | |
} | |
Action.prototype.dispatch = function(){ | |
this.dispatcher.dispatch(this); |
This file contains hidden or 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
require("ncp").ncp("node_modules/docco/resources/parallel/", "parallel", function(err, res) { console.log("done:", arguments); }); |
This file contains hidden or 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
# Sublime package NVM node path configuration | |
# Save this file in: | |
# ~/.config/sublime-text-2/Packages/node_env.py | |
import os | |
os.environ["PATH"] = "/home/joao/.nvm/v0.10.2/bin:/home/joao/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" | |
print "PATH=" + os.environ["PATH"] |
This file contains hidden or 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
Rebase with unclean working directory | |
"unclean" | |
- staged changes | |
- unstaged changed | |
- untracked files | |
Accidental commit in middle of pull --rebase | |
Pulling commits out of a feature branch |
This file contains hidden or 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
[git-top-down]$ git hub-clone | |
/home/southerd/.ghf/bin/git-hub-clone <org/repo>: Initialize a new working repository, and set git-hubflow configurations. | |
<org/repo>: The organization and repository name to clone from. | |
[git-top-down]$ git hub-clone github-flow/recipes | |
Fork at https://github.com/DavidSouther/recipes | |
Project cloned into /home/southerd/devel/southerd/git-top-down/recipes | |
[git-top-down]$ cd recipes/ | |
[recipes (master)]$ ls | |
README.md |
This file contains hidden or 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
// based on https://www.shadertoy.com/view/4dXGR4 by flight404, itself | |
// based on https://www.shadertoy.com/view/lsf3RH by trisomie21 | |
float snoise(vec3 uv, float res) { | |
const vec3 s = vec3(1e0, 1e2, 1e4); | |
uv *= res; | |
vec3 uv0 = floor(mod(uv, res))*s; | |
vec3 uv1 = floor(mod(uv+vec3(1.), res))*s; |
cc by-sa 3.0
Take command of a Stellar Naval Vessel (SNV) in a universe with physics from the CoDominium universe. Manage navigation, weapons, science, and more as you lead your crew on various missions ranging from military engagements to interstellar diplomacy to scientific exploration. Earn your place in the admiralty and take on larger missions, eventually controlling armadas and fleets at a galactic level.
This file contains hidden or 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
Github Flow | |
Central project repository: "upstream" | |
Developer GH repository: "origin" | |
Developer local repository: "localhost" | |
Init: | |
Project: | |
Create branches on "upstream" | |
master |