⭐ git-cheatsheet ⭐

This Repository is a guide to all the git commands you need to use in case any of these situations arise

Basic Commands ✌️

• Clone a Repository

 git clone https://github.com/CodeChefVIT/git-cheatsheet.git

 Replace  url with your required repository url  

• Set username and emailId

   git config --global user.name "FIRST_NAME LAST_NAME"
   
   git config --global user.email "MY_NAME@example.com"

• Pushing to a Repository

  git add .
  git commit -m <commit message>
  git push origin master

  To add just one file or a set of files replace the . with your filename in first command

• Check where is your Repository remote

  git remote -v

  Output should have the repository url similar to this 

  origin	https://github.com/CodeChefVIT/git-cheatsheet.git (fetch)
  origin	https://github.com/CodeChefVIT/git-cheatsheet.git (push)

• Change Remote

git remote set-url origin <new git url>

• Check logs

    git log 
   
   Output should be something similar 

    commit 82e2a7c46a96b3b4aaf5acbc0cbc218d118aa922
    Author: <User> <45638240+<User>@users.noreply.github.com>
    Date:   Fri May 15 14:52:32 2020 +0530

    <Commit Message>

Branches 🌳

• Create new branch

   git checkout -b newbranch

   Replace newbranch with your branch name

• Check current branch

   git branch

   This should list all your branches and highlight the current branch in green

• Switch to new branch

   git checkout newbranch

• Push in new branch

    git add .
    git commit -m <commit message>
    git push origin <branch name>

Update forked Repository with original Repository ⌛

These steps are to be followed when your forked repository is few commits behind original repository

  - Add original repository url here 

    git remote add upstream https://github.com/whoever/whatever.git

  - Fetch all branches of the repository

    git fetch upstream

  - Make sure you are on master branch

    git checkout master

  -  Rewrite your master branch so that any commits of yours that aren not already in upstream/master are replayed on top of that other branch

    git rebase upstream/master

    This should update your forked repository with original repository

    However if you do not want to rewrite history of master branch then replace last command with this

    git merge upstream/master