Protect our Git repos: stop foxtrot merges now | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		Protect our Git repos: stop foxtrot merges now (blog.bitbucket.org)
		2 points by gsylvie on July 29, 2016 \| hide \| past \| favorite \| 1 comment

J_Darnley on July 29, 2016 [–]

A better solution: rebase or cherry-pick so that every commit has one parent and history is linear. That way every commit shows what was actually changed.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact