Git vs GitHub

Git

• git config

  • git config --global user.name "Your Name"
  • git config --global user.email "Your Email"

• ssh login

  • ssh-keygen -t ed25519 -C "your_email@example.com"

• git clone <url>

  • ssh url: git@github.com:username/repo.git

• git status

• git add <file>

• git commit -am "Message"

• git push

• git pull

Git Branches

• To View : git branch
• To Create : git branch <branch-name>
• To Switch : git checkout <branch-name>
• To Create and Switch : git checkout -b <branch-name>
• To Delete : git branch -d <branch-name>

View Log

• git log --graph
• git log --oneline --graph
• git reflog

Git Reset

• git reset HEAD@{1}q
• git reset --soft HEAD@{1}
• git reset --hard HEAD@{1}

Merge Conflicts

local main: A -> B -> C cloud main: A -> B -> D

main merge feature: A -> B ->[C -> D]

Files

• Untracked
• Staged
• Committed
• Pushed