Cacher is the code snippet organizer for pro developers

Rebasing master to current branch rewrites history in a way that all the changes occurred on master gets pulled and placed before the commits done on current bracnh.
This way it looks like all the changes happened since one started to work on a branch happened after the last commit on master.

git fetch
git rebase origin/master
git push origin +BRANCH_NAME 
	// + makes a force push (only for this branch's refs)
// or: git push --force

If only you work on the branch:

1.
// be on the branch you want to squash
git rebase -i HEAD~4 
	// where 4 is the number of commits to squash

2.
pick xxxxx 
squash xxxxx
squash xxxxx
squash xxxxx
squash xxxxx
	// change all, but the first "pick" command to "squash"

3.
//set custom commit message for the squashed commit

4.
git push origin +BRANCH_NAME 
	// + makes a force push (only for this branch's refs)

If more people works on the branch

1.
git pull --rebase
git add .
git rebase -i HEAD~4
	// where 4 is the number of commits to squash

2.
pick xxxxx 
squash xxxxx
squash xxxxx
squash xxxxx
squash xxxxx
	// change all, but the first "pick" command to "squash"

3.
//set custom commit message

4.
git pull --rebase

5.
//resolve conflicts, keep own code

6.
git add .

7.
git rebase --continue

8.
git push origin +BRANCH_NAME
	// + makes a force push (only for this branch's refs)