Git commands & workflows

List of Git commands and workflows we generally use

Git commands and workflows

• 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.

• Cherry pick

• commit --amend - To change the last commit

• push -f

Git GUI aid

• Android Studio/IntelliJ git UI

• Gitkraken Git Client

• SourceTree

• Github Desktop