Discover expert insights on web development, IT services, and tech trends at GandS – your tech guide.

Cheat Sheets - GandS - Catch The Exception


# SETUP

Configuring user information used across all local repositories

<table style={{ width: '100%' }} border="1" cellPadding="5" cellSpacing="0">
  <tr>
    <th>Command</th>
    <th>Purpose</th>
  </tr>
  <tr>
    <td>`git config --global user.name "Name"`</td>
    <td>Configure your user name</td>
  </tr>
  <tr>
    <td>`git config --global user.email "Email"`</td>
    <td>Configure your user email</td>
  </tr>
  <tr>
    <td>`git config --list`</td>
    <td>Git configurations information</td>
  </tr>
</table>

# Initilalizing

Initilalizing and Cloning repositories

<table style={{ width: '100%' }} border="1" cellPadding="5" cellSpacing="0">
  <tr>
    <th>Command</th>
    <th>Purpose</th>
  </tr>
  <tr>
    <td>`git init`</td>
    <td>Initilalizing a repository in an existing project</td>
  </tr>
  <tr>
    <td>`git clone [URL]`</td>
    <td>Download and Initilalize repository from git hosting</td>
  </tr>
</table>

# Staging

<table style={{ width: '100%' }} border="1" cellPadding="5" cellSpacing="0">
  <tr>
    <th>Command</th>
    <th>Purpose</th>
  </tr>
  <tr>
    <td>`git reset [file_name]`</td>
    <td>Add file with given file_name in your project to the staging area</td>
  </tr>
  <tr>
    <td>`git add .`</td>
    <td>Add all files in your project to the staging area</td>
  </tr>
  <tr>
    <td>`git add gan*`</td>
    <td>
      Add all files starting with **gan** in your project to the staging area
    </td>
  </tr>
  <tr>
    <td>`git reset [file_name]`</td>
    <td>Discarding file from staging area</td>
  </tr>
</table>

# Commit Changes

<table style={{ width: '100%' }} border="1" cellPadding="5" cellSpacing="0">
  <tr>
    <th>Command</th>
    <th>Purpose</th>
  </tr>
  <tr>
    <td>`git commit`</td>
    <td>Open a editor where you can add a commit message</td>
  </tr>
  <tr>
    <td>`git commit -m "message"`</td>
    <td>Add a commit message without opening the editor</td>
  </tr>
  <tr>
    <td>`git commit -a -m "message"`</td>
    <td>Add and commit tracked files (skip staging area)</td>
  </tr>
  <tr>
    <td>`git commit -am "message"`</td>
    <td>Add and commit tracked files (skip staging area)</td>
  </tr>
</table>

# Diff

<table style={{ width: '100%' }} border="1" cellPadding="5" cellSpacing="0">
  <tr>
    <th>Command</th>
    <th>Purpose</th>
  </tr>
  <tr>
    <td>`git diff`</td>
    <td>Changes you did in all the unstaged files</td>
  </tr>
  <tr>
    <td>`git diff [file_name]`</td>
    <td>Changes you did in changed file</td>
  </tr>
  <tr>
    <td>`git diff --staged`</td>
    <td>Changes you did in all the staged files</td>
  </tr>
</table>

# Branch & Merge

<table style={{ width: '100%' }} border="1" cellPadding="5" cellSpacing="0">
  <tr>
    <th>Command</th>
    <th>Purpose</th>
  </tr>
  <tr>
    <td>`git branch`</td>
    <td>List all the branches(Current branch marked with *)</td>
  </tr>
  <tr>
    <td>`git branch {branch_name}`</td>
    <td>Creates a new branch</td>
  </tr>
  <tr>
    <td>`git checkout {branch_name}`</td>
    <td>Switch to another branch or newly created branch</td>
  </tr>
  <tr>
    <td>`git checkout -b {branch_name}`</td>
    <td>Create and Switch branch</td>
  </tr>
  <tr>
    <td>`git branch -d {branch_name}`</td>
    <td>Delete a branch. **Only use this only if branch is merged** </td>
  </tr>
  <tr>
    <td>`git merge {branch_name}`</td>
    <td>Merge the branch's history into current branch</td>
  </tr>
</table>

# Files

<table style={{ width: '100%' }} border="1" cellPadding="5" cellSpacing="0">
  <tr>
    <th>Command</th>
    <th>Purpose</th>
  </tr>
  <tr>
    <td>`git rm [file_name]`</td>
    <td>Remove the file and stage the removal</td>
  </tr>
  <tr>
    <td>`git mv [old_file] [new_file]`</td>
    <td>Rename or Move files and stage the move</td>
  </tr>
</table>

# Temporary Commits

<table style={{ width: '100%' }} border="1" cellPadding="5" cellSpacing="0">
  <tr>
    <th>Command</th>
    <th>Purpose</th>
  </tr>
  <tr>
    <td>`git stash`</td>
    <td>Save modified and staged changes</td>
  </tr>
  <tr>
    <td>`git stash list`</td>
    <td>List all stashes</td>
  </tr>
  <tr>
    <td>`git stash apply`</td>
    <td>Apply the most recent stash</td>
  </tr>
  <tr>
    <td>`git stash apply stash@[id]`</td>
    <td>Apply stash with given id</td>
  </tr>
  <tr>
    <td>`git stash drop`</td>
    <td>Discard the top from stash stack</td>
  </tr>
  <tr>
    <td>`git stash pop`</td>
    <td>Apply the most recent stash</td>
  </tr>
</table>

# Sync & Update

<table style={{ width: '100%' }} border="1" cellPadding="5" cellSpacing="0">
  <tr>
    <th>Command</th>
    <th>Purpose</th>
  </tr>
  <tr>
    <td>`git remote add [alias] [url]`</td>
    <td>Adds a remote repository to your local repository</td>
  </tr>
  <tr>
    <td>`git fetch [alias]`</td>
    <td>Fetch all the branches from remote repository</td>
  </tr>
  <tr>
    <td>`git pull`</td>
    <td>Fetch and merge from remote branch</td>
  </tr>
  <tr>
    <td>`git push [alias] [branch]`</td>
    <td>Update the remote repository branch from local commits</td>
  </tr>
</table>

# Sync & Update

<table style={{ width: '100%' }} border="1" cellPadding="5" cellSpacing="0">
  <tr>
    <th>Command</th>
    <th>Purpose</th>
  </tr>
  <tr>
    <td>`git status`</td>
    <td>Status of the current repository</td>
  </tr>
  <tr>
    <td>`git log`</td>
    <td>Commit history for current repository</td>
  </tr>
  <tr>
    <td>`git remote -v`</td>
    <td>List all remote repositories</td>
  </tr>
</table>


Quick reference for essential Git commands: setup, branching, merging, resolving conflicts, and managing remotes.