15 Feb '13, 3pm

rebase like a boss

rebase like a boss

Everyone who loves Git hopefully loves branching. However, there’s a problem with branching: merging your work back in. Suprisingly enough, Git’s inflexibility makes this action quite simple. It’s my opinion that Git users should be branching frequently, and rebasing them back into the mainline when ready. Merges should be used only to denote when long lived branches (read: several weeks, months) are brought into the mainline, or for some reason you want to specifically denote when two histories were joined together. Rebasing as often as possible means you keep the history graph as simple as possible. For example, you may be seeing a lot of these if you’re only doing merges: There’s a way around this: use git rebase ! The action of rebasing is conceptually simple: you’re playing a set of changes on top of another branch. I like Travis Swicegood’s metaphor the best: rebase ...

Full article: http://robots.thoughtbot.com/post/165641717/rebase-like-a...

Tweets

R2D2 collects Valentine’s cards like a boss

R2D2 collects Valentine’s cards like a boss

hackaday.com 16 Feb '13, 5pm

Inspiration – (Dr. Evil voice on) When I was in first grade, like many of us we were tasked with building the “best” valen...

T Magazine: Like Father, Like Daughter: A Frenc...

tmagazine.blogs.nytimes.com 15 Feb '13, 2pm

“Oh you’re going to shoot in Olympia’s new apartment?” asks Pierre Le-Tan, one of France’s most renowned illustrators. “I’...

You like Spanish music, more specifically salsa...

ask.fm 16 Feb '13, 5pm

Matthew Hall (TheMatHall) Newcastle 0 geschenke 1354 gefällt das 5675 antworten + Folgen Ein Geschenk senden You like Span...

Git merge vs. rebase

mislav.uniqpath.com 20 Feb '13, 10pm

Merge vs. rebase By Mislav Marohnić on 20 Feb 2013 The short: git pull --rebase instead of git pull git rebase -i @{u} bef...

“There is a feeling like the clenching of a fist”

otterman.wordpress.com 16 Feb '13, 7am

“There is a feeling like the clenching of a fist” goo.gl/fb/ebQ2R Sent 54 minutes ago @chengpuay @cubismwonder wah, this i...

A meteorite hit Russia this morning, and here's what it looked like

A meteorite hit Russia this morning, and here's...

grist.org 15 Feb '13, 3pm

A meteor weighing an estimated 11 tons streaked through the atmosphere at 33,000 miles per hour , hitting Chelyabinsk, Rus...

of my boss harassed me for being gay: Mr Lawrence Bernard Wee Kim San is claiming "constructive dismissal" again...

of my boss harassed me for being gay: Mr Lawren...

lancerlord.blogspot.com 11 Feb '13, 1pm

Mr Lawrence Bernard Wee Kim San is claiming "constructive dismissal" against Robinsons. He says his former boss at the dep...

You know you had a great night when your new sneakers end up looking like this!!!! LOL

You know you had a great night when your new sn...

instagram.com 25 Feb '13, 4am

You know you had a great night when your new sneakers end up looking like this!!!! LOL