Tony Li tonglil

a simple git branching model (written in 2013)

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.

HEY: I've turned this into a blog post, which is a little more in depth.

🚨 https://eev.ee/blog/2016/06/04/converting-a-git-repo-from-tabs-to-spaces/ 🚨

Death to tabs, long live spaces

Do this

Conventions:

Defining Eloquent model (will assume that DB table named is set as plural of class name and primary key named "id"):

class Shop extends Eloquent {}

Using custom table name

protected $table = 'my_shops';

OS X Screencast to animated GIF

This gist shows how to create a GIF screencast using only free OS X tools: QuickTime, ffmpeg, and gifsicle.

Instructions

To capture the video (filesize: 19MB), using the free "QuickTime Player" application:

Sample service script for debianoids

Look at LSB init scripts for more information.

Usage

Copy to /etc/init.d:

# replace "$YOUR_SERVICE_NAME" with your service's name (whenever it's not enough obvious)

Locate the section for your github remote in the .git/config file. It looks like this:

[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = [email protected]:joyent/node.git

Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:

	1) Delete the line containing 'unicorn' from Gemfile
	2) Add the following line under the "Servers" section
	gem "puma", "~> 1.6.3"
	3) From /home/gitlab/gitlab run
	sudo bundle install --no-deployment
	4) From /home/gitlab/gitlab run the install command that fits the database you are using, I use MySQL
	sudo -u gitlab -H bundle install --deployment --without development test postgres
	5) Create a new file config/puma.rb. Put the following inside it
	#!/usr/bin/env puma

	// Disable bold.
	term_.prefs_.set('enable-bold', false)

	// Use this for Solarized Dark
	term_.prefs_.set('background-color', "#002b36");
	term_.prefs_.set('foreground-color', "#839496");

	term_.prefs_.set('color-palette-overrides', [
	'#073642',
	'#dc322f',

	<?php
	/*
	OCP - Opcache Control Panel (aka Zend Optimizer+ Control Panel for PHP)
	Author: _ck_ (with contributions by GK, stasilok)
	Version: 0.1.7
	Free for any kind of use or modification, I am not responsible for anything, please share your improvements

	* revision history
	0.1.7 2015-09-01 regex fix for PHP7 phpinfo
	0.1.6 2013-04-12 moved meta to footer so graphs can be higher and reduce clutter

	-- show running queries (pre 9.2)
	SELECT procpid, age(clock_timestamp(), query_start), usename, current_query
	FROM pg_stat_activity
	WHERE current_query != '<IDLE>' AND current_query NOT ILIKE '%pg_stat_activity%'
	ORDER BY query_start desc;

	-- show running queries (9.2)
	SELECT pid, age(clock_timestamp(), query_start), usename, query
	FROM pg_stat_activity
	WHERE query != '<IDLE>' AND query NOT ILIKE '%pg_stat_activity%'