Merge branch 'squash'

1 files changed, 8 insertions, 0 deletions

diff --git a/git.org b/git.org
index 10d72d7..8cfcbe4 100644
--- a/git.org
+++ b/git.org
@@ -202,6 +202,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