peter@OFFICE:~/workspace/common$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 1 different commit each, respectively.
#
nothing to commit (working directory clean)
peter@OFFICE:~/workspace/common$ git log --pretty=format:"%h %s" --graph
* 0f56d64 forced commit after "overwrite" of strutil.h
* 09023c9 peter 0803
* 55a2508 test
* fb23440 Merge branch 'master' of ssh://foo...bar.../var/git/common
|\
peter@OFFICE:~/workspace/common$ git log -p
commit 0f56d6433cfbd6ad00c3f677d8314e70a92e29e1
Author: Peter Carlson <peter@howudodat.com>
Date: Fri Dec 7 08:13:28 2012 -0800
forced commit after "overwrite" of strutil.h
diff --git a/utils/strutil.h b/utils/strutil.h
index ab02f4a..0154dde 100755
--- a/utils/strutil.h
+++ b/utils/strutil.h
@@ -1,4 +1,4 @@
-// i want to scream
+// peter 2 making a change at 0801^M
commit 09023c98c7c593ed8ecc460c70dbc66d853e44c3
Author: Peter Carlson <peter@howudodat.com>
Date: Fri Dec 7 08:04:33 2012 -0800
peter 0803
diff --git a/utils/mathxtras.h b/utils/mathxtras.h
index 190e339..9f2235c 100644
--- a/utils/mathxtras.h
+++ b/utils/mathxtras.h
@@ -1,8 +1,7 @@
-// life just keep getting harder
-// peter changed this line hoping that life will get better
+// peter at 0803
]]>