Merge branch 'master' of git://github.com/sethwoodworth/tldr into sethwoodworth-master

Conflicts:
	pages/common/git-init.md

pages/common/git-fetch.md

@@ -0,0 +1,11 @@
+# git fetch
+
+> Download objects and refs from a remote repository
+
+- Fetch new branches and update remote-tracking branches
+
+`git fetch {{remote_name}}`
+
+- Fetch the latest changes from all remote git servers
+
+`git fetch --all`

pages/common/git-init.md

@@ -6,6 +6,6 @@
 
 `git init`
 
-- Initialize a barebones repository:
+- Initialize a barebones repository, suitable for use as a remote over ssh
 
 `git init --bare`

pages/common/git-rebase.md

@@ -0,0 +1,19 @@
+# git rebase
+
+> Apply local commits on top of another branch's history
+
+- Rebase your local branch interactively with the latest changes in local master
+
+`git rebase -i master`
+
+- Rebase your local branch  interactively with the latest changes from upstream
+
+`git fetch origin; git rebase -i origin/master`
+
+- Handling an active rebase merge failure, after editing conflicting file(s)
+
+`git rebase --continue`
+
+- Abort a rebase in-progress
+
+`git rebase --abort`