git to the masses - git rebase --onto

git rebase --onto

"Hold on to your butts.." --Samuel L. Jackson as Ray Arnold in 'Jurassic Park' Part One: The two-argument form of git rebase --onto Say there's a commit C made on master that made a change to a configuration parameter that, it turns out, wasn't actually necessary, so that commit needs to go. For the purposes of this demonstration, commits D and E don't rely upon the changes made in C. (If D or E did rely on C, you'd end up with a conflict to resolve, which you'd be able to do at that point.) A--B--C--D--E master One way to get rid of the offending commit would be to do an interactive rebase, deleting the line that has commit C on it: git rebase -i C~1 delete the line containing commit C save and close the editor A quicker way is to use the two-argument git rebase --onto , as going interactive just to delete a commit (or commits) is a little overkill, and considerably slowe...

Full article: http://pivotallabs.com/users/khicks/blog/articles/2118-gi...