From 357c370ff23b22047573efd0dd985a2742be26e6 Mon Sep 17 00:00:00 2001
From: Brian Cully <bjc@kublai.com>
Date: Sat, 28 Mar 2009 19:08:16 -0400
Subject: Add git problem solutions and hubris.

---
 git.org | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/git.org b/git.org
index a68cb91..ca7349c 100644
--- a/git.org
+++ b/git.org
@@ -177,13 +177,26 @@
   Can be used to reset the index, or certain files in the index, to a
   given commit, which is HEAD by default.
 
-* How dVCS democratizes version control
+* Problems git solves
+
+** Mixed two patches together
+
+  # git reset $filename
+  # git add --patch
+  # git commit
+
+** In combination with git rebase, entire histories can be manipulated
 
 * My seekrit agenda
 
   I am a lazy programmer, and the more people who use git the easier
   my life is. I use git because...
 
+** Three great virtues of a programmer
+*** Laziness
+*** Impatience
+*** Hubris
+
 * Additional Resources
 
   # Git - SVN Crash Course
-- 
cgit v1.3