This is how I use
git either working as part of a team or individually.
I use an amend/rebase mutable-history workflow where each idea is always represented by one commit. I never make checkpoint commits, and I only need to write git commit messages once per feature (and perhaps amend them), and I never merge. I have two git aliases:
wip: (“work in progress”)
git commit -a -m
git status && git commit -a --amend -c HEAD
git push --force
To start a new change, I work in feature branches.
To update a change, I amend it into HEAD.
To start a new feature which depends on another feature, I branch off the branch. I do this rarely.
To pull in other users’ changes to a first-degree branch, I rebase. I do this often to keep my branch up to date.
To rebase an nth-degree branch, I cherry-pick. This is usually painless, while using rebase often is not.
Alternatively, I’ll use
In many cases, just deleting every commit from the interactive rebase except HEAD results in a clean rebase.
To push a change, I use
git force. This should only be done on feature
branches; never develop.