| ▲ | mkleczek 4 days ago | |
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 4 days ago | parent [-] | |
+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... | ||