From: Chris <chris.barker@nyu.edu>
Date: Wed, 4 Feb 2015 17:51:49 +0000 (-0500)
Subject: Notes for understanding git
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=cadad1a4324b56bb6b32cd062a84671cc23c7a28

Notes for understanding git
---

diff --git a/notes-git b/notes-git
new file mode 100644
index 00000000..4ccb972d
--- /dev/null
+++ b/notes-git
@@ -0,0 +1,9 @@
+git commit -a : -a stages all files that are tracked and modified
+  without needing to explicitly git add them.
+git remote show origin
+git pull origin master
+when ready to post: 
+  git checkout shared
+  git merge cb
+git mergetool (requires setting [merge] tool = vimdiff in config)
+git pull = fetch + merge