GIT

What is the Git terminal? At its core, Git is a set of command line utility programs that are designed to execute on a Unix style command-line environment. Modern operating systems like Linux and macOS both include built-in Unix command line terminals. This makes Linux and macOS complementary operating systems when working with Git. Source: atlassian.com

Getting started with git:

If you are on any linux distro you can use the package management tool that comes with your distribution to install it.

└─$ sudo apt install git-all

Git configuration

• Setting up your username and email

└─$ git config --global user.name "your username"

└─$ git config --global user.email "youremail@email.com"

• Saving your git token locally

└─$ git config --global credential.helper store

Starting a project

└─$ git init

└─$ git init <directory>

└─$ git clone <url>

Making changes

• Stage a single file

  └─$ git add <file name>
  

• Stage all files

  └─$ git add .
  

• Commit all staged files

  └─$ git commit -m "your commit message"
  

• To remove file from staged area

  └─$ git rm --cached "file_name"
  

• Remove file

  └─$ git rm <file name>
  

Branches

• Creating new branch

  └─$ git branch "branch_name"
  

• Listing all local branches

  └─$ git branch -a
  

• Creating and switching to another branch

  └─$ git checkout -b "branch_name"
  

• Switching to another branch

  └─$ git checkout "branch_name"
  

• To delete/remove a branch

  └─$ git branch -d "branch_name"
  

• Deleting a branch whether merged or not

  └─$ git branch -D "branch_name"
  

• To push your branch

  └─$ git push --set-upstream origin "branch_name"
  

  Remote updates

• To list remotes

  └─$ git remote -v
  

• To show information

  └─$ git remote show "remote_name"
  

• To add remote

  └─$ git remote add "path/url"
  

• To fetch changes from remote repo(no merge)

  └─$ git fetch "remote_name"
  

• To fetch from specific branch

  └─$ git fetch "remote_name" "branch_name"
  

• To fetch and merge

  └─$ git pull "remote_name" "branch_name"
  

• To push local to remote

  └─$ git push "remote_name "branch_name"
  

• To delete remote branch

  └─$ git push remote :branch
  

  Merging

• To merge into current branch

  └─$ git merge "branch_name"
  

• Merge tool to resolve conflicts

  └─$ git mergetool
  

• Rebase into branch

  └─$ git rebase "branch_name"
  

  Pulling and pushing

• Upload all staged files

  └─$ git push
  

• Upload content to remote

  └─$ git push "remote_name"
  

• Upload to a branch

  └─$ git push "remote_name" "branch_name"
  

• Fetch and merge remote repo’s copy

  └─$ git pull
  

• To move your local changes to the latest changes made to remote repo(rebase)

  └─$ git pull --rebase "remote_name"