$ git show HEAD
commit 2fd7d9b248e0b4a3b531b9af3bb61916d42ad45f
Author: danasselin johndoe@example.com
Date: Thu Oct 29 15:42:55 2015 -0400
Add first question to physics quiz
diff --git a/physics.txt b/physics.txt
index e69de29…3d47f43 100644
— a/physics.txt
+++ b/physics.txt
@@ -0,0 +1,3 @@
+1. A scalar is a quantity which has both magnitude and direction.
+a) true
+b) false
\ No newline at end of file
$ git merge origin/master
merge: origin/master -
not something we can merge
$ pwd
/home/ccuser/workspace/curriculum-a/my-quizzes