Git Basics and Useful commands

Git Basics -

git config

• configure author name and email adress

• git config –global user.name “name”

• git config –global user.email “email address”

git config –global user.name "MyName"

git config –global user.email "myname@mymail.com"

git init

• Initialize git in your repository
• git init repository name

git init [OR] git init \home\desktop\repoName

git clone

• to clone a remote repository
• git clone url

git clone https://github.com/SriSatyaLokesh/git-workshop

git add

• to add files to staging (commit list)
• git add filename
• git add . - to add all files

git add README.md
git add .

git diff

• to see what files are in staging, what are changes made
• git diff
  • changes which aren’t staged
• git diff -staged
  • changes that are staged
• git branch_1 branch_2
  • check differences between branches

git commit

• to commit changes made in file, each commit is a save point.
• git commit -m "commit message"

git commit -m "Added README.md"

git reset

• git reset filename
  • to unstage a file
• git reset commit_ID
  • undo commit changes [preserves a copy]
• git reset --hard commit_ID
  • undo commit changes and discards

git status

• shows files that are to be commited

git status

git rm

• to remove a file from git repo

git rm README.md

git log

• to see commit log, everything abour commits - what, when, who, where

git log

git show

• git show commit_ID
  • to see what all changes are done in a commit

Branches -

Let’s start working with branches

git branch

• git branch
  • lists all branch names
• git branch "branch name"
  • creates a new branch
• git branch [-d] [-D] "branch name"
  • [-d] - Soft Delete - deletes locally
  • [-D] - Hard Delete - deletes locally and remotely

    git checkout

• git checkout "branch name"
  • to switch to specified branch
• git checkout -b "branch name"
  • create and switch a branch from current branch

    git merge

• git merge "branch name"
  • merges given branch in the current branch

Colloboration with others -

Let’s colloborate with others using remote repos

git remote

• to connect your local repo to the remote repo
• git remote add origin "Remote Server Link"

git add origin https://github.com/SriSatyaLokesh/git-workshop

git push

• to push your commits from local repo to remote repo
• git push origin "branch name"
  • to push specified branch changes
• git push -all
  • push all branches

    git pull

• to pull remote changes into local repo
• git pull "remote repo URL"

git pull https://github.com/SriSatyaLokesh/git-workshop

git stash and pop

• just to save the copy of changes, before switching branches and can revert back using pop.
• you can easily use this in VS Code

other commands

• cherry-pick
• rebase
• etc

It’s not simple but it’s useful. But start using and practice, you’ll end up loving git