OliverBalfour

How to have local versions of tracked config files in git

This is a fairly common question, and there isn't a One True Answer.

These are the most common techniques:

	# We use the global settings as a shortcut to define our own separator.
	# Based on the default i3blocks config file.
	full_text=〉
	align=center
	color=#666666
	separator=false
	separator_block_width=7

	[volume]
	command=/usr/libexec/i3blocks/volume

	@echo off
	:: Path to Sublime Text installation dir.
	SET stPath=%~dp0sublime_text.exe
	SET stPathOnly=%~dp0
	:: Key name for the registry entries.
	SET UserEntry=Sublime Text
	SET AdminEntry=Sublime Text As Admin
	:: Context menu texts.
	SET "UserMenuText=Open with Sublime(&-)"
	SET "AdminMenuText=Open with Sublime As Admin(&+)"

	Latency Comparison Numbers (~2012)
	----------------------------------
	L1 cache reference 0.5 ns
	Branch mispredict 5 ns
	L2 cache reference 7 ns 14x L1 cache
	Mutex lock/unlock 25 ns
	Main memory reference 100 ns 20x L2 cache, 200x L1 cache
	Compress 1K bytes with Zippy 3,000 ns 3 us
	Send 1K bytes over 1 Gbps network 10,000 ns 10 us
	Read 4K randomly from SSD* 150,000 ns 150 us ~1GB/sec SSD

	<!DOCTYPE html>
	<html>
	<head>
	<meta charset="utf-8" />
	<title>Canvas Hexagonal Map</title>
	<style type="text/css">
	canvas {
	border:0;
	display:block;
	margin:0 auto;