Rebase - Instead of creating a merge commit to merge a feature from a different branch, we "rebase and merge" the branch to keep a clean commit history. Please read more about how to use it here.
commit --amend - To change the last commit
Android Studio/IntelliJ git UI
Gitkraken Git Client