21 May '12, 2pm

New blag post, git add -e:

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, in other words, whereas git add -p will show you each hunk for every file and ask what you want to do for each of them, git add -e will show you the entire patch and allow you to edit it at will. I used this trick to recently split apart one massive commit into 28 smaller, digestible ones. Say you've replaced a line containing "baz" with one containing "bar". When you git add -e , you'll be presented with a diff like so: foo - baz + bar From here you can decide, actually, you don't want to delete baz, you just want to add bar. And you want to add it above baz. From this spot you can just change the minus to a space, making that line context for the diff. Then you can move the line that adds bar above baz, with this result: foo + bar baz After saving and...

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

Tweets

All you ever wanted to know about "git reset -p":

pivotallabs.com 16 May '12, 2pm

I've been using git reset -p a lot recently and I think it makes sense to clarify what it is that it does because when I f...

Too yummie to be true! Strawberry crepecake...

Too yummie to be true! Strawberry crepecake...

sarahs-loft.com 27 May '12, 4pm

Hello hello! If you’re thinking.. this photo looks vaguely familiar… It’s not the same but quite similar to the one in thi...

git with tortoise cc @poorprogrammer

git with tortoise cc @poorprogrammer

sparkfun.com 20 May '12, 7am

Yay! You're in. Let's create a new repository. Click on the 'New Repository' button and enter the project name, descriptio...

Sofia yacht by Moonen is overhauled with 3-person submarine to add a twist to your ocean saga #luxury

Sofia yacht by Moonen is overhauled with 3-pers...

luxurylaunches.com 21 May '12, 1pm

Sofia yacht by Moonen is overhauled with 3-person submarine to add a twist to your ocean saga Dutch yard Moonen’s affair w...

What can I add to my "green shopping cart"? #green

greenbuildingadvisor.com 16 May '12, 2pm

Howdy all! I live in Portland, ME (zone 6A). I was recently approved for an energy loan of $15,000. What prompted me to do...

New post!

New post!

audreylim.com 26 May '12, 12pm

Had some time to spare while waiting for a friend in town and went on a little splurge to chase the project blues away. Be...

Audi introduces sport e-bike concept at Wörthersee

greencarcongress.com 20 May '12, 5pm

Audi introduces sport e-bike concept at Wörthersee 11 May 2012 Audi e-bike Wörthersee. Click to enlarge. One of the highli...

git rebase --onto

pivotallabs.com 28 May '12, 5pm

"Hold on to your butts.." --Samuel L. Jackson as Ray Arnold in 'Jurassic Park' Part One: The two-argument form of git reba...