28 May '12, 5pm

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...

Tweets

cap-git-deploy (0.0.1): Mikamai-style deploy st...

rubygems.org 29 May '12, 2pm

cap-git-deploy 0.0.2 Mikamai-style deploy strategy install gem install cap-git-deploy Download Documentation Subscribe Sta...

Check out: Agile git and the story branch patte...

blog.hasmanythrough.com 30 May '12, 3pm

The first thing this approach helps with is being able to make frequent commits without breaking the build or disrupting t...

New blag post, git add -e:

pivotallabs.com 21 May '12, 2pm

git add -e is like git add -p , except instead of adding things at the hunk level, you edit the entire patch at once. Or, ...

[Standup][SF] 2012.05.25 - 1 git repo, 2 Procfi...

pivotallabs.com 25 May '12, 9pm

*"1 git repo, 2 Heroku apps, 2 procfiles? Heroku currently is limited to 1 procfile per repo, so we've created a rake task...