In short, after you finished your feature branch, reset the branch against master and re-create commit history based on logical groups.
git
programming
FoldFold allExpandExpand allAre you sure you want to delete this link?Are you sure you want to delete this tag?
The personal, minimalist, super fast, database-free, bookmarking service by the Shaarli community