This is an old revision of the document!

GIT

Task	Command
Start a new repo	git init
Clone an existing repo	git clone <url>

Task	Command
Set a config option	git config user.name 'Your Name'
Set a config option	git config user.email 'Your email'
Set option globally	git config –global …
Add an alias	git config alias.st status
See all possible config options	man git-config

Task	Command
Add untracked file or unstaged changes	git add <file>
Add all untracked files and unstaged changes	git add .
Choose which parts of a file to stage	git add -p
Move file	git mv <old> <new>
Delete file	git rm <file>
Tell Git to forget about a file without deleting it	git rm –cached <file>
Unstage one file	git reset <file>
Unstage everything	git reset
Check what you added	git status

Task	Command
Make a commit (and open text editor to write message)	git commit
Make a commit	git commit -m 'message'
Commit all unstaged changes	git commit -am 'message'

Task	Command
Switch branches	git switch <name> OR git checkout <name>
Create a branch	git switch -c <name> OR git checkout -b <name>
List branches	git branch
List branches by most recently committed to	git branch –sort=-committerdate
Delete a branch	git branch -d <name>
Force delete a branch	git branch -D <name>

Task	Command
Diff all staged and unstaged changes	git diff HEAD
Diff just staged changes	git diff –staged
Diff just unstaged changes	git diff

Task	Command
Show diff between a commit and its parent	git show <commit>
Diff two commits	git diff <commit> <commit>
Diff one file since a commit	git diff <commit> <file>
Show a summary of a diff	git diff <commit> –stat git show <commit> –stat

Task	Command
Delete unstaged changes to one file	git restore <file> OR git checkout <file>
Delete all staged and unstaged changes to one file	git restore –staged –worktree <file> OR git checkout HEAD <file>
Delete all staged and unstaged changes	git reset –hard
Delete untracked files	git clean
'Stash' all staged and unstaged changes	git stash

Task	Command
“Undo” the most recent commit (keep your working directory the same)	git reset HEAD^
Squash the last 5 commits into one	git rebase -i HEAD~6 Then change “pick” to “fixup” for any commit you want to combine with the previous one
Undo a failed rebase	git reflog BRANCHNAME Then manually find the right commit ID in the reflog, then run: git reset –hard <commit>
Change a commit message (or add a file you forgot)	git commit –amend

Task	Command
Look at a branch's history	git log main git log –graph main git log –oneline
Show every commit that modified a file	git log <file>
Show every commit that modified a file, including before it was renamed	git log –follow <file>
Find every commit that added or removed some text	git log -G banana
Show who last changed each line of a file	git blame <file>

Task	Command
Combine with Rebase	git switch banana git rebase main Before After
Combine with Merge	git switch main git merge banana Before After
Combine with Square Merge	git switch main git merge –squash banana git commit Before After
Bring a branch up to date with another branch (aka “fast-forward merge”)	git switch main git merge banana git commit Before After
Copy one commit onto the current branch	git cherry-pick <commit> Before After