Will Wolff-Myren willwm

git cheat-sheet

The git command-line utility has plenty of inconsistencies http://steveko.wordpress.com/2012/02/24/10-things-i-hate-about-git/

A GUI like http://sourcetreeapp.com is often helpful, but staying on the command line usually quicker. This is a list of the commands I use most frequently, listed by functional category:

Current state

git status list which (unstaged) files have changed

C# For Python Programmers

Syntax and core concepts

Basic Syntax

Single-line comments are started with //. Multi-line comments are started with /* and ended with */.
C# uses braces ({ and }) instead of indentation to organize code into blocks. If a block is a single line, the braces can be omitted. For example,

OS X Preferences

most of these require logout/restart to take effect

# Enable character repeat on keydown
defaults write -g ApplePressAndHoldEnabled -bool false

# Set a shorter Delay until key repeat

	import java.util.*;
	public class BellmanFord
	{
	public static long dist[];
	public static long prev[];
	public static LinkedList<DirectedEdge> edgesList = new LinkedList<DirectedEdge>();

	public static class DirectedEdge{
	protected int v;
	protected int w; // edge

	# fetch from the default remote, origin
	git fetch
	# reset your current branch (master) to origin's master
	git reset --hard origin/master

	### Ours Merging Method

	# fetch from the default remote, origin
	git fetch
	# create a branch at your current master

	% --------------------------------------------------------------
	% This is all preamble stuff that you don't have to worry about.
	% Head down to where it says "Start here"
	% --------------------------------------------------------------

	\documentclass[12pt]{article}

	\usepackage[margin=1in]{geometry}
	\usepackage{amsmath,amsthm,amssymb}