John Speno JohnSpeno

The Secret Passions of Git Checkout

The Hand of God

Git checkout can do almost anything ... or, at least, many things. It can switch branches. It can mix and match branches. It can resolve merge conflicts. It can give you a scratchpad to test things. It can even be used to interactively patch files. It's so powerful because it's so abstract. But much like numinous mystics, abstraction makes it confusing.

Basically git checkout does two things:

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.

The Best of the Best Practices (BOBP) Guide for Python

A "Best of the Best Practices" (BOBP) guide to developing in Python.

In General

Values

"Build tools for others that you want to be built for you." - Kenneth Reitz
"Simplicity is alway better than functionality." - Pieter Hintjens

2015-01-29 Unofficial Relay FAQ

Compilation of questions and answers about Relay from React.js Conf.

Disclaimer: I work on Relay at Facebook. Relay is a complex system on which we're iterating aggressively. I'll do my best here to provide accurate, useful answers, but the details are subject to change. I may also be wrong. Feedback and additional questions are welcome.

What is Relay?

Relay is a new framework from Facebook that provides data-fetching functionality for React applications. It was announced at React.js Conf (January 2015).

	import re
	import simplejson

	from django.http import HttpResponse
	from django.conf import settings


	class JSONResponse(HttpResponse):
	def __init__(self, request, data):
	indent = 2 if settings.DEBUG else None

	#!/bin/sh
	#
	# gunicorn_sr Startup script for gunicorn for sr
	#
	# chkconfig: - 86 14
	# processname: gunicorn
	# pidfile:
	# description: Python application server
	#
	### BEGIN INIT INFO

	#!/bin/bash

	usage() {
	cat << EOF
	Usage: $0 [OPTION]... COMMAND
	Execute the given command in a way that works safely with cron. This should
	typically be used inside of a cron job definition like so:
	* * * * * $(which "$0") [OPTION]... COMMAND

	Arguments:

	#!/usr/bin/env python
	# -- coding: utf-8 --

	import argparse

	if __name__ == '__main__':

	parser = argparse.ArgumentParser(description="""
	I never freaking remember argparse syntax and the docs are so all over the place
	that I need this for an example.

	Write a program that does what it’s supposed to do
	Write idiomatic code
	Debug a program that you wrote
	Debug a program someone else wrote
	Debug the interaction between a system you wrote and one you didn’t
	File a good bug report
	Modify a program you didn’t write
	Test a program you wrote
	Test a program you didn’t write
	Learn a new programming language

	# Credit http://stackoverflow.com/a/2514279
	for branch in `git branch -r \| grep -v HEAD`;do echo -e `git show --format="%ci %cr" $branch \| head -n 1` \\t$branch; done \| sort -r