Git

🧰 Git Cheat Sheet

🔧 1. Git Configuration

Set the name

git config --global user.name "User name"

Set the email

git config --global user.email "himanshudubey481@gmail.com"

Set the default editor

git config --global core.editor Vim

Check the settings

git config --list

Set up Git aliases

git config --global alias.co checkout

git config --global alias.br branch

git config --global alias.ci commit

git config --global alias.st status

🚀 2. Starting a Project

Initialize a local repository

git init <Repo Name>

Clone a remote repository

git clone <remote URL>

📝 3. Local Changes

Add a specific file

git add <filename>

Add all files

git add *

Commit with a message

git commit -m "Commit Message"

🔍 4. Track Changes

View unstaged changes

git diff

View staged changes

git diff --staged

View changes after commit

git diff HEAD

View diff between two commits

git diff <commit1> <commit2>

View diff between branches

git diff <branch1> <branch2>

Check status

git status

Show object data

git show

📜 5. Commit History

View full log

git log

View log in one-line format

git log --oneline

View files modified in commits

git log --stat
( or )
git log --stat --oneline -p

Show patch (diff) of commits

git log -p
( or )
git log --oneline -p

Blame (line-wise history)

git blame <filename>

🚫 6. Ignoring Files

Create .gitignore

touch .gitignore

List ignored files

git ls-files -i --exclude-standard

🌿 7. Branching

Create a new branch

git branch <branch-name>

Create a new branch with tags

git checkout -b <branch-name> tags/<tag-name>

List all branches

git branch --list

Delete a branch

git branch -d <branch-name>

Delete a remote branch

git push origin --delete <branch-name>

Rename a branch

git branch -m <old-name> <new-name>

Switch to a branch

git checkout <branch-name>

Create and switch to new branch

git checkout -b <branch-name>

Checkout a remote branch

git checkout <remote-branch>

📦 Git Stash

Stash current changes

git stash

Stash with a message

git stash save "Your stash message"

List all stashes

git stash list

Apply last stash

git stash apply

View stash content

git stash show

Apply and remove last stash

git stash pop

Drop last stash

git stash drop

Clear all stashes

git stash clear

Create a branch from stash

git stash branch <branch-name>

🍒 Cherry-pick

Cherry-pick is used to apply a specific commit (or commits) from one branch onto your current branch, without merging the whole branch.

Apply specific commit

git cherry-pick <commit-id>

🔀 8. Merging & Rebasing

Switch to the target branch before merging another branch into it.

Merge branches

git checkout <destination-branch>
git merge <source-branch-name>

List Merged Branches

git branch --merged

List Unmerged Branches

git branch --no-merged

Merge a commit

git merge <commit-id>

Rebase a branch

git rebase <branch-name>

Continue rebase

git rebase --continue

Skip a rebase commit

git rebase --skip

Interactive rebase

git rebase -i

🌐 9. Remote Management

View remotes

git remote -v

Add remote

git remote add <name> <url>

Fetch from remote

git fetch <remote>

View Changes After Fetch

Check what’s different between your local branch and the fetched data

git diff $(cat .git/GETCH_HEAD)

Checkout a File from Remote

Restore a specific file from the remote master branch

git checkout origin/master -- <file-name>

Remove remote

git remote rm <name>

Rename remote

git remote rename <old> <new>

Show remote info

git remote show <name>

Change remote URL

git remote set-url <name> <new-url>

📤 10. Pushing Updates

Push to remote

git push origin master

Force push

git push <remote> <branch> -f

Delete remote branch

git push origin --delete <branch-name>

📥 11. Pulling Updates

Pull from remote

git pull origin master

Pull specific remote branch

git pull <remote-branch-URL>

Fetch remote repo

git fetch <repository-url>

Fetch specific branch

git fetch <branch-url> <branch-name>

Fetch all branches

git fetch --all

Sync local repo

git fetch origin

⏪ 12. Undo Changes

Revert a commit

git revert <commit-id>

Hard reset

Change the head to the $commit_id and remove the changes from working directory, staging and local

git reset --hard <commit-id> 

Soft reset

Revert commits to stage

git reset --soft <commit-id>

Mixed reset

Revert commits to working directory (default option when we use revert)

git reset --mixed <commit-id>

🗑️ 13. Removing Files

Remove file from Git and disk

git rm <filename>

Remove file from Git but keep locally

git rm --cached <filename>

🏷️ 14. Git Tags

Create a lightweight tag

git tag <tagname>

Create an annotated tag

git tag -a <tagname> -m "Tag message"

List all tags

git tag

Show tag details (annotated)

git show <tagname>

Tag a specific commit

git tag <tagname> <commit-hash>

Delete a local tag

git tag -d <tagname>

Delete a remote tag

git push origin --delete <tagname>

Push a single tag to remote

git push origin <tagname>

Push all local tags to remote

git push --tags