This was stolen from Stephen Ball 👍
- Using git-log, copy commit hash from the last commit previous to your work beginning;
git log - Rebas branch starting at the hash from step 1;
git rebase -i HASH - Change first pick to reword or r.
- Change the rest of the picks to fix or f so they get squashed; I tend to copy the list of commits to reference when writing my update
- Save the changes.
- Update the title appropriate commit title.
- Write a good paragraph/sentence explaining the work that was done. Someone should be able to know what happened in this commit and how it affects the code base.
- Save changes.
- Do a git force push up to your branch;
git push -f origin/<BRANCH> - Check branch your git webUI to make sure all is well.