Let's say I have branch send-stats, and I have couple of commits which I need to squash and merge to devel branch.
Follow these steps:
git checkout send-stats- switch to my branchgit rebase -i devel- rebase interactively relatively todevel, here we need to squash all commits to the first one
- in vim:
:2,$s/pick/f/- relacespicks toffor every line except first one - indicates those commits as 'to squash'