diff options
| author | Brian Cully <bjc@kublai.com> | 2009-03-28 19:08:16 -0400 |
|---|---|---|
| committer | Brian Cully <bjc@kublai.com> | 2009-03-28 19:16:08 -0400 |
| commit | 2fcd4a82335f4fc4abad1c03b2e145d6de718bba (patch) | |
| tree | c73b9cc55a704c5157c5754ac039f1f7dbe508ac | |
| parent | be36325d7bd77cfd803989f452f32f387c8e390b (diff) | |
| download | dvcs-git-slides-2fcd4a82335f4fc4abad1c03b2e145d6de718bba.tar.gz dvcs-git-slides-2fcd4a82335f4fc4abad1c03b2e145d6de718bba.zip | |
Add git problem solutions.
| -rw-r--r-- | git.org | 18 |
1 files changed, 17 insertions, 1 deletions
@@ -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 |