From 49c3e9421725353d395c2325247f09064b0d582f Mon Sep 17 00:00:00 2001 From: Richard Littauer Date: Mon, 16 Mar 2015 09:33:13 -0700 Subject: [PATCH] Moved doctoc --- README.md | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 2a3851a..31f8cf8 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,23 @@ # Flight rules for git +#### What are "flight rules"? + +A [guide for astronauts](http://www.jsc.nasa.gov/news/columbia/fr_generic.pdf) (now, programmers using git) about what to do when things go wrong. + +> *Flight Rules* are the hard-earned body of knowledge recorded in manuals that list, step-by-step, what to do if X occurs, and why. Essentially, they are extremely detailed, scenario-specific standard operating procedures. [...] + +> NASA has been capturing our missteps, disasters and solutions since the early 1960s, when Mercury-era ground teams first started gathering "lessons learned" into a compendium that now lists thousands of problematic situations, from engine failure to busted hatch handles to computer glitches, and their solutions. + +— Chris Hadfield, *An Astronaut's Guide to Life*. + +#### Conventions for this document + +For clarity's sake all examples in this document use customized bash prompt in order to indicate the current branch and whether or not there are staged changes. The branch is enclosed in parentheses, and a `*` next to the branch name indicates staged changes. + **Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - - [What are "flight rules"?](#what-are-flight-rules) - - [Conventions for this document](#conventions-for-this-document) - [I wrote the wrong thing in a commit message](#i-wrote-the-wrong-thing-in-a-commit-message) - [I need to add staged changes to the previous commit](#i-need-to-add-staged-changes-to-the-previous-commit) - [I tried to push my amended commit to a remote, but I got an error message](#i-tried-to-push-my-amended-commit-to-a-remote-but-i-got-an-error-message) @@ -25,21 +37,6 @@ -### What are "flight rules"? - -A [guide for astronauts](http://www.jsc.nasa.gov/news/columbia/fr_generic.pdf) (now, programmers using git) about what to do when things go wrong. - -> *Flight Rules* are the hard-earned body of knowledge recorded in manuals that list, step-by-step, what to do if X occurs, and why. Essentially, they are extremely detailed, scenario-specific standard operating procedures. [...] - -> NASA has been capturing our missteps, disasters and solutions since the early 1960s, when Mercury-era ground teams first started gathering "lessons learned" into a compendium that now lists thousands of problematic situations, from engine failure to busted hatch handles to computer glitches, and their solutions. - -— Chris Hadfield, *An Astronaut's Guide to Life*. - - -### Conventions for this document - -For clarity's sake all examples in this document use customized bash prompt in order to indicate the current branch and whether or not there are staged changes. The branch is enclosed in parentheses, and a `*` next to the branch name indicates staged changes. - ## I wrote the wrong thing in a commit message