Question 1

What is the difference between git reset and git revert?

Accepted Answer

git reset completely rewrites commit history by removing commits after a specific point. git revert, on the other hand, keeps existing commits and adds a new commit that undoes the changes. For commits already pushed to remote, revert is safer. Reset can be used for local-only changes.

Question 2

Should I use git merge or git rebase?

Accepted Answer

Merge preserves branch history and creates a merge commit. Rebase reorganizes commits on top of the base branch, creating a clean linear history. Use merge for shared branches, and rebase for cleaning up personal feature branches. Avoid rebasing commits that have already been pushed.

Question 3

When should I use git stash?

Accepted Answer

git stash is used to temporarily save your current work in progress. It's useful when you need to quickly switch branches but your changes aren't ready to commit yet. Save with git stash, do other work, then restore with git stash pop.

Question 4

What is the difference between git fetch and git pull?

Accepted Answer

git fetch downloads changes from the remote repository but doesn't merge them into your current branch. git pull performs a fetch and then automatically merges. Use fetch when you want to review remote changes first, and pull when you want to merge immediately.

Command	Description
`git config --global user.name "[name]"`	Set user name
`git config --global user.email "[email]"`	Set email
`git config --list`	List all settings
`git init`	Initialize new repository
`git clone [url]`	Clone remote repository

Command	Description
`git status`	Check status
`git add [file]`	Stage file
`git add .`	Stage all changes
`git commit -m "[message]"`	Create commit
`git commit -am "[message]"`	Stage and commit
`git push`	Push to remote
`git pull`	Pull from remote
`git fetch`	Fetch without merge

Command	Description
`git branch`	List branches
`git branch [name]`	Create new branch
`git checkout [branch]`	Switch branch
`git checkout -b [name]`	Create and switch
`git switch [branch]`	Switch branch (new)
`git switch -c [name]`	Create and switch (new)
`git merge [branch]`	Merge branch
`git branch -d [name]`	Delete branch
`git branch -D [name]`	Force delete

Command	Description
`git log`	Commit history
`git log --oneline`	One line per commit
`git log --graph`	Show graph
`git log -p`	Show patches
`git show [commit]`	Show commit details
`git diff`	Show changes
`git diff --staged`	Staged changes
`git blame [file]`	Show line authors

Command	Description
`git restore [file]`	Discard changes
`git restore --staged [file]`	Unstage file
`git reset HEAD~1`	Undo last commit (keep changes)
`git reset --hard HEAD~1`	Undo last commit (discard)
`git revert [commit]`	Revert commit (new commit)
`git clean -fd`	Remove untracked files

Git Cheatsheet

#Setup

#Basic Commands

#Branches

#History

#Undo

#Stash

#Remote

#Tags

#Advanced

#Frequently Asked Questions

Command	Description
`git stash`	Stash changes
`git stash save "[message]"`	Stash with message
`git stash list`	List stashes
`git stash pop`	Apply and remove stash
`git stash apply`	Apply stash (keep)
`git stash drop`	Drop stash
`git stash clear`	Clear all stashes

Command	Description
`git remote -v`	List remotes
`git remote add [name] [url]`	Add remote
`git remote remove [name]`	Remove remote
`git push -u origin [branch]`	Set upstream and push
`git push origin --delete [branch]`	Delete remote branch

Command	Description
`git tag`	List tags
`git tag [name]`	Create tag
`git tag -a [name] -m "[msg]"`	Create annotated tag
`git push origin [tag]`	Push tag
`git push origin --tags`	Push all tags

Command	Description
`git rebase [branch]`	Rebase
`git rebase -i HEAD~[n]`	Interactive rebase
`git cherry-pick [commit]`	Cherry-pick commit
`git bisect start`	Start bisect
`git reflog`	Reference log
`git submodule add [url]`	Add submodule