summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Cully <bjc@kublai.com>2009-03-28 19:15:11 -0400
committerBrian Cully <bjc@kublai.com>2009-03-28 19:15:11 -0400
commit0c5f325df29cc20dc1d4819527493c441c444c18 (patch)
tree6edae602368a8ae2ae813c574b1ef55746a40d37
parent1e7677422eca44c52355171e2600f2e5fbfc1e56 (diff)
downloaddvcs-git-slides-split.tar.gz
dvcs-git-slides-split.zip
Add rebase -i example.split
-rw-r--r--git.org8
1 files changed, 8 insertions, 0 deletions
diff --git a/git.org b/git.org
index ca7349c..b6ac789 100644
--- a/git.org
+++ b/git.org
@@ -187,6 +187,14 @@
** 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
I am a lazy programmer, and the more people who use git the easier