git merge --no-ff git log --first-parent git bisect --first-parent The above giv... | Hacker News

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

		mkleczek 59 days ago \| parent \| context \| favorite \| on: At the end you use `git bisect` git merge --no-ff git log --first-parent git bisect --first-parent The above gives you clean PR history in the main branch while retaining detailed work history in (merged) feature branches. I really don't understand why would I squash having git merge --no-ff at my disposal...

rectang 59 days ago [–]

+1, I have `git merge --no-ff` and `git pull --ff-only` set in my global gitconfig[1].

[1] https://github.com/rectang/dotfiles/blob/master/gitextra#L11...

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