Permalink
Browse files

remove the bad monster truck image

  • Loading branch information...
1 parent 461fc0b commit 2e03af583de2df27565d44aec5837eb0a87b982b @qrush qrush committed Dec 18, 2011
Showing with 0 additions and 2 deletions.
  1. +0 −2 _posts/2009-02-10-squashing-commits-with-rebase.textile
@@ -6,8 +6,6 @@ category: advanced
The "rebase":http://gitready.com/intermediate/2009/01/31/intro-to-rebase.html command has some awesome options available in its @--interactive@ (or @-i@) mode, and one of the most widely used is the ability to squash commits. What this does is take smaller commits and combine them into larger ones, which could be useful if you're wrapping up the day's work or if you just want to package your changes differently. We're going to go over how you can do this easily.
-p=. "!http://farm4.static.flickr.com/3073/2926413646_8e4a7b7db4.jpg?v=0!":http://flickr.com/photos/7552532@N07/2926413646/
-
*A word of caution:* Only do this on commits that haven't been pushed an external repository. If others have based work off of the commits that you're going to delete, plenty of conflicts can occur. Just don't rewrite your history if it's been shared with others.
So let's say you've just made a few small commits, and you want to make one larger commit out of them. Our repository's history currently looks like this:

0 comments on commit 2e03af5

Please sign in to comment.