• Table of Contents:
• Git Basics
• General
• Git Visualizer
• Undo Changes
• Renaming and Moving
• History
• Alias
• Ignoring unwanted files and folders
• Comparison
  • Setting vscode as difftool and mergetool
• Turning of the Default Prompt
  • Working Directory | Staged Area
  • Working Directory | Git Repository
  • Staged Area | Git Repository
  • Commit | Last Commit
  • Local | Remote
• Branching and Merging
• Rebasing
• Stashing
  • multiple stashes
  • Stash into a Branch
• Tagging
  • Annotated Tag
  • Other Commands
• Reset and Reflog
• Cherry-Pick
• Rewriting History
  • Update Last Commit

3 local stage + 1 remote:

1. Working directory
   • may or may not be managed by git, but git is aware of them
2. Staging area - pre-commit holding area
   • git index: a holding area for queueing up changes for the next commit
3. Commit - git repository (history in .git folder)
4. Remote repository

The git repository:

1. Working directory (~/projects/my-project)
2. Repository (/.git --> hidden)

Table of Contents

configurations first:

git config --global user.name "username"
git config --global user.email "email"

Note: git commit --amend will update and replace the most recent commit with a new commit that combines any staged changes with the contents of the previous commit. With nothing currently staged, this just rewrites the previous commit message.

Table of Contents

Click Git Visualizer to see visualization of git basic commands.

Note: HEAD is just a pointer.

Table of Contents

Table of Contents

Table of Contents

Examples:

git config --global alias.unstage 'reset HEAD --'
git config --global alias.hist 'log --all --oneline --graph --decorate'

Table of Contents

Add unwanted files and folders name to .gitignore file.

• Note: adding README.md does not work. git does not ignore readme files even if you add it to .gitignore.

Table of Contents

• Note: All comparisons are done for files tracked by git. If file is not in the list of git tracked files (git ls-files), the changes will not be shown.

Table of Contents

The way to wire them together is to modify your .gitconfig and you have two options.

1. To do this with command line entries, enter each of these:

git config --global merge.tool vscode
git config --global mergetool.vscode.cmd "code --wait $MERGED"
git config --global diff.tool vscode
git config --global difftool.vscode.cmd "code --wait --diff $LOCAL $REMOTE"

2. To do this by pasting some line in the .gitconfig with VS Code.

   • Run git config --global core.editor "code --wait" from the command line.
   • From here you can enter the command git config --global -e. You will want to paste in the code in the "Extra Block" below.

[user]
    name = EricDJohnson
    email = [email protected]

# Comment: You just added this via 'git config --global core.editor "code --wait"'
[code]
    editor = code --wait

# Comment: Start of "Extra Block"
# Comment: This is to unlock VSCode as your git diff and git merge tool    
[merge]
    tool = vscode
[mergetool "vscode"]
    cmd = code --wait $MERGED
[diff]
    tool = vscode
[difftool "vscode"]
    cmd = code --wait --diff $LOCAL $REMOTE
# Comment: End of "Extra Block"

Now in your git directory with a conflict, run git mergetool and you have VSCode helping you handle the merge conflict! To compare, run git difftool.

Note: After performing a merge, the original file with conflict markers can be saved as a file with a .orig extension.If this variable is set to false then this file is not preserved. Defaults to true (i.e. keep the backup files).

Table of Contents

Table of Contents

Table of Contents

Table of Contents

Table of Contents

Table of Contents

Note: Fast-forwarded merge means git places all commits on the master branch as if we never branched away.

Get the graph with git log --oneline --graph --decorate:

git merge <branch>

  *__*__* new branch
 /                           --->
/ master (no commits here)          /*__*__* master (new branch merged)

Note: Fast-forwarding is only possible when there are no changes being made on the master branch.

Get the graph with git log --oneline --graph --decorate:

git merge <branch> --no-ff

  *__*__* new branch                  *__*__*
 /                           --->    /       \
/ master (no commits here)          / __ __ __\ master (new branch merged)

Note: Read Stackoverflow

Table of Contents

git rebase <branch>

  *__*__* new branch                           *__*__* new branch
 /                        --->                /       
/ *__*__*__* master               / *__*__*__* master

git pull rebase

/*__* master                  
                        --->                  
/ *__*__*__* master             / *__*__*__*__*__* master

Table of Contents

Note: stashes have index and the last stash index is 0. e.g. 4 saved stashes:

stash@{0}
stash@{1}
stash@{2}
stash@{3}

stash@{3} is the first stash we made and stash@{0} is the last stash.

Table of Contents

Annotated tag is equivalent to a commit message, but for tags.

Table of Contents

Note: git reflog is different with git log as it includes everything we have done. For example. git log does not show moving HEAD between different commits.

git ammend is the command to rewrite the history by changing the last commit or on your own branch at the public that no one has branched off of or is relying on the history of your branch. Because once you change that commit history, you are going to create a huge conflict with anybody who is relying on that history. You definitely never want to do this on master.

Note: Be careful of using git ammend. You only want to do this on a local branch

1. First get the commit id from git reflog.
2. Checkout to the commit by git checkout <commit_id>.
3. Branch away by git checkout -b <branch>.

Now HEAD is on the commit <commit_id>.