[khasinski]

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.

[frou_dh]

Do you agree with my edit? I'm no git pro, so still trying to get things straight in my mind.

[khasinski]

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.