News for hackers. Stuff that matters.
Re:Git pull --rebase until it hurts by khasinski on Tuesday April 30, 2013 @08:00AM (#5631604)
You nailed it. Commit history is for people to read.

Check out git flow, you might like it. It could add even more structure and readability to your codebase history.

Re:Git pull --rebase until it hurts by frou_dh on Tuesday April 30, 2013 @08:31AM (#5631709)
Do you agree with my edit? I'm no git pro, so still trying to get things straight in my mind.
Re:Git pull --rebase until it hurts by khasinski on Tuesday April 30, 2013 @10:08AM (#5632256)
Yes, --no-ff merge after a rebase gives a clear indication that's a feature merged from a feature branch. It's easy to cherry-pick it to another branch (for example for a backport to an old version), easy to bisect this branch or remove the entire feature.