Dan MacTough danmactough

I get asked pretty regularly what my opinion is on merge commits vs rebasing vs squashing. I've typed up this response so many times that I've decided to just put it in a gist so I can reference it whenever it comes up again.

I use merge, squash, rebase all situationally. I believe they all have their merits but their usage depends on the context. I think anyone who says any particular strategy is the right answer 100% of the time is wrong, but I think there is considerable acceptable leeway in when you use each. What follows is my personal and professional opinion:

Gmail and GitHub

How to filter emails from GitHub in Gmail and flag them with labels.

The labels in this document are just examples.

Pull Request

Filter	Label

The prep-script.sh will setup the latest Node and install the latest perf version on your Linux box.

When you want to generate the flame graph, run the following (folder locations taken from install script):

sudo sysctl kernel.kptr_restrict=0
# May also have to do the following:
# (additional reading http://unix.stackexchange.com/questions/14227/do-i-need-root-admin-permissions-to-run-userspace-perf-tool-perf-events-ar )
sudo sysctl kernel.perf_event_paranoid=0

	/*
	Copy this into the console of any web page that is interactive and doesn't
	do hard reloads. You will hear your DOM changes as different pitches of
	audio.

	I have found this interesting for debugging, but also fun to hear web pages
	render like UIs do in movies.
	*/

	const audioCtx = new (window.AudioContext \|\| window.webkitAudioContext)()

	#!/bin/bash -xe
	# Unload nouveau
	sudo rmmod nouveau
	# Load nvidia
	sudo modprobe nvidia
	# Configure X
	sudo nvidia-xconfig --use-display-device=None --virtual=1280x1024 --output-xconfig=/etc/X11/xorg.conf --busid=PCI:0:3:0 --enable-all-gpus

	1: async (5,306,139)
	2: mkdirp (3,989,808)
	3: request (3,822,748)
	4: glob (3,750,793)
	5: minimatch (3,476,898)
	6: commander (3,475,471)
	7: debug (3,454,917)
	8: qs (3,372,442)
	9: inherits (3,105,353)
	10: graceful-fs (3,005,257)

	{

	/**
	* Tell JSHint about global variables.
	*/
	"predef": [

	// https://github.com/pivotal/jasmine
	"after",
	"afterEach",

	#!/bin/bash
	echo "Finding latest version."
	VERSION=`curl -s http://nodejs.org/dist/latest/SHASUMS.txt \| awk '/node-v/ {print $2}' \| head -1 \| sed s/node-v// \| sed s/-/\ / \| awk '{print $1}'`
	echo "Preparing to install node-v$VERSION"

	url="http://nodejs.org/dist/v"$VERSION"/node-v"$VERSION".tar.gz"

	echo "GET" $url
	curl $url \| tar -zxf -

	/** @jsx React.DOM */

	var BootstrapModalMixin = function() {
	var handlerProps =
	['handleShow', 'handleShown', 'handleHide', 'handleHidden']

	var bsModalEvents = {
	handleShow: 'show.bs.modal'
	, handleShown: 'shown.bs.modal'
	, handleHide: 'hide.bs.modal'

	#!/usr/bin/env bash
	# MIT © Sindre Sorhus - sindresorhus.com

	# git hook to run a command after `git pull` if a specified file was changed
	# Run `chmod +x post-merge` to make it executable then put it into `.git/hooks/`.

	changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"

	check_run() {
	echo "$changed_files" \| grep --quiet "$1" && eval "$2"