summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Cully <bjc@kublai.com>2009-03-28 19:08:16 -0400
committerBrian Cully <bjc@kublai.com>2009-03-28 19:10:57 -0400
commit1f86eb5f693c31696f93ef1be5ec18cb479dc2df (patch)
treeddf7cd268753566f02f3a158ca346339fe2f248c
parentbe36325d7bd77cfd803989f452f32f387c8e390b (diff)
downloaddvcs-git-slides-1f86eb5f693c31696f93ef1be5ec18cb479dc2df.tar.gz
dvcs-git-slides-1f86eb5f693c31696f93ef1be5ec18cb479dc2df.zip
Add git problem solutions.
-rw-r--r--git.org10
1 files changed, 9 insertions, 1 deletions
diff --git a/git.org b/git.org
index a68cb91..a0c03ed 100644
--- a/git.org
+++ b/git.org
@@ -177,7 +177,15 @@
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