Git CheatSheet

git config rebase.autosquash true

git config --global user.name "Your Name"
git config --global user.email "[email protected]"
git config --global init.defaultBranch main
git config --global pull.rebase false

git status                    # Working directory status
git log --oneline            # Compact commit history
git log --graph --oneline    # Visual commit graph
git diff                     # Working directory changes
git diff --staged           # Staged changes

git add .                    # Stage all changes
git add -p                   # Interactive staging
git commit -m "message"      # Commit with message
git commit --amend          # Modify last commit
git commit --fixup <hash>   # Create fixup for commit

git branch                   # List branches
git branch <name>           # Create branch
git checkout <branch>       # Switch branch
git switch <branch>         # Modern switch branch
git checkout -b <name>      # Create and switch
git branch -d <name>        # Delete merged branch
git branch -D <name>        # Force delete branch

git merge <branch>          # Merge branch
git merge --no-ff <branch>  # Force merge commit
git merge --squash <branch> # Squash merge

git rebase -i HEAD~3        # Interactive rebase last 3
git rebase -i <hash>        # Rebase from specific commit
git rebase --autosquash -i  # Auto-arrange fixup commits

git remote -v               # List remotes
git remote add <name> <url> # Add remote
git fetch                   # Fetch updates
git pull                    # Fetch and merge
git push                    # Push changes
git push -u origin <branch> # Set upstream and push

git branch -u origin/<branch>    # Set upstream
git push --set-upstream origin <branch>  # Push and set upstream

git stash                   # Stash changes
git stash -u               # Include untracked files
git stash list             # List stashes
git stash pop              # Apply and remove stash
git stash apply            # Apply without removing
git stash drop             # Delete stash

git checkout -- <file>     # Discard file changes
git restore <file>         # Modern discard changes
git clean -fd              # Remove untracked files/dirs

git reset --soft HEAD~1    # Undo commit, keep changes staged  
git reset --mixed HEAD~1   # Undo commit, unstage changes
git reset --hard HEAD~1    # Undo commit, discard changes
git revert <hash>          # Create reverting commit

git config --global alias.co checkout
git config --global alias.br branch  
git config --global alias.ci commit
git config --global alias.st status
git config --global alias.unstage 'reset HEAD --'
git config --global alias.last 'log -1 HEAD'
git config --global alias.visual '!gitk'

git checkout main
git pull
git checkout -b feature/new-feature
# Make changes and commits
git push -u origin feature/new-feature
# Create Pull Request

git checkout main
git pull
git checkout -b hotfix/critical-fix
# Make fix
git commit -m "fix: critical issue"
git checkout main
git merge hotfix/critical-fix
git push
git branch -d hotfix/critical-fix

git log -S "search term"    # Search content in commits
git log --grep="pattern"    # Search commit messages
git blame <file>           # See who changed what

git cherry-pick <hash>     # Apply commit to current branch
git cherry-pick -n <hash>  # Apply without committing

git submodule add <url>    # Add submodule
git submodule update --init # Initialize submodules
git submodule update --remote # Update to latest