Git is a very powerful tool in developers toolkit.
Here is a simple cheatsheet for my git workflow.
Branches
Branches are importing to work on different features on the code. A branch per feature.
# creating a new branch called 'dev'
git branch dev
# entering the branch called 'dev'
# note any changes to code must be committed or stashed
git checkout dev
# go back to previous branch working on
git checkout -
Change the branch name from master to main
git branch -m master main
Stash
This is great way of storing changes temporarily without needing to commit any code.
# saving a stash
git stash save "message to self"
# list all stashes
git stash list
# bring changes back
git stash apply <name of stash>
# bring changes back and drops the previous stash
git stash pop
# dropping a stash
git stash drop <name of stash>
# clearing ALL stashes (WARNING)
git stash drop
Adding and Committing at the same time
# add and commit
git commit -am "message"
# update the latest commit message
git commit --amend -m "ammendded message"
# updating code, with same commit message, only works if commit has not been pushed
git add .
git commit --ammend --no-edit
# going back to previous state
git revert
# seeing changes over time - an easy way to view all this
git log --graph --oneline --decorate
# searching through commit using binary search
git bisect start
# commit looks good
git bisect good
# commit looks bad
git bisect bad
Squashing code
git rebase main --interactive
# pick to use commit, squash to combine the commit
# using fixup and squash when committing
git commit --fixup
git commit --squash
git rebase -i --autosquash
Resetting things
Careful this will get rid of all changes
git fetch origin
git reset --hard origin/main
#clean up unused files
git clean -df
More to checkout
Checkout LazyGit. This is a terminal application for git.