From 2fcd4a82335f4fc4abad1c03b2e145d6de718bba 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.

---
 git.org | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/git.org b/git.org
index a68cb91..3a78d98 100644
--- a/git.org
+++ b/git.org
@@ -177,7 +177,23 @@
   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
+
+  # git rebase -i $ref
+  # git reset HEAD^
+  # git add --patch
+  # git commit -c ORIG_HEAD
+  # git add -u
+  # git commit
+  # git rebase --continue
 
 * My seekrit agenda
 
-- 
cgit v1.2.3