git pull --rebase
alwaysgit checkout -b feature/my-awesome-feature
before committing anythinggit commit --amend
whenever possiblegit commit --fixup
andgit commit --squash
in case you pushed to origin and you don't want to force push now- Write long and meaningful commit messages
- Create a Pull Request and continue pushing more commits till review is accepted
git rebase -i --autosquash master feature/my-awesome-feature
and squash all unwanted commitsgit push --force-with-lease origin my-awesome-feature
when branches have diverged- Merge the Pull Request
Created
June 20, 2015 20:25
-
-
Save boopathi/e32b84be0add622ebf37 to your computer and use it in GitHub Desktop.
A simple git workflow that works
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment