GUIDEDeep dive
Daily Git Workflow
Daily Git is a small loop: check status and diff, stage, commit, sync and push. Master this loop before rebase and reset.
The loop
git status and git diff: confirm changes.
git add -p and git commit -m: commit in small steps.
git pull --rebase and git push: sync and publish.
Good habits
One concern per commit; explain why in the message.
Run tests before pushing; understand conflicts before resolving.
FAQ
Should I pull before committing?
Commit locally first; sync before pushing to limit conflicts.
pull or pull --rebase?
Rebase keeps personal branches linear; follow team rules on shared branches.
Sources
Related calculators
Git Commands: Gamified 60-Card Deck60 Git command and concept cards covering commits, branches, undo and recovery, with spaced review.More guides
Hiragana vs KatakanaRead guideSpaced Repetition and the Forgetting CurveRead guideOn Readings vs Kun ReadingsRead guideAn N5 Kanji Study OrderRead guideKEEP READING
Keep reading
Read in order, or jump to another guide on the same topic.
← PreviousCommon Python TrapsMutable defaults, shallow copies, integer division, is vs ==.Next →Undo and Recover in GitChoosing between restore, reset, revert and reflog.