Git Cheatsheet

Git configuration

git config --global color.ui auto

Define author name: git config --global user.name 'user name'

Define author email: git config --global user.email 'user email'

Create alias for git command: git config --global alias.<alias_name><git-command>

Define text editor used by git commands: git config --system core.editor '<editor> --wait'

Open the global configuration file in a text editor for manual editing: git config --global --edit

Adding

git remote add <remote_name> <remote-repo-url>

Pushing

Push to remote repo: git push or git push origin main

Push local branches to remote (first time): git push -u <remote_name><local_branch_name>

"u" flag creates a remote tracking reference for every branch you successfully push on to the remote
allows the use of the git pull command without any arguments

Push the local repo branch under: <local_branch_name> to the remote repo @ <remote_name>

Removing

git remote rm upstream

Miscellaneous

Fetching remote: git fetch <remote name>/<branch name>
Checkout remote: git checkout <remote name>/<branch name>

Cloning a repo

Option 1 (clone to current directory): git clone <url>

Option 2 (clone to specified directory): git clone <url> <directory>

New repo

Option 1 (Local directory already created):

cd <project-folder>
git init

Option 2 ((Local directory NOT already created): git init <project_directory>

Option 3: (initialize empty repo): git init --bare <project_directory>

Saving Changes to the Repo

Option #1 (add single file): git add <file_name>

Option #2 (add all files): git add .

Option #3 (interactive staging session): git add -p

"p" flag gets hunks and selectively add

Committing Changes to the Repo

Option #1 (open interactive editor): git commit

Option #2 (commit with a short message): git commit -m "some short message"

"m" flag adds a short message instead of opening up an editor

Option #3 (modify the las commit with staged changes): git commit --amend

Delete a branch

Delete a branch (local): git branch -D <branch-name>

Option 1 (Delete remote branch): git push origin :<branch-name>

Option 2 (Delete remote branch): git push origin --delete <branch-name>

Misc

Create a branch from remote: git checkout -b <new_branch_name> <remote>

Option #1: git diff --color-words

Option #2: git diff-highlight

Option #3: git diff branch1 ... branch2

Option #4: git diff <branch1><branch2> ./file.txt

Advanced Git commands

Add & Commit: git commit -am "short message goes here"
Amend:
- Change the message of current commit: git commin --amend -m "new message"
- Add additional changes to current commit: git add . git commit --amend --no-edit
Override remote history: git push origin main --force
Revert: git log --oneline git revert <commit id>
Stash:
- Save with a name: git stash save <name>
- List: git stash list
- Apply: git stash apply <index>
Rename branch: git branch -M <newName>
Decorate the logs: git log --graph --decorate --oneline
Switch back previous branch: git checkout -
Copy remote changes: git fetch origin git reset --hard origin/main
- still untracked files: git clean -df

Glossary

A definition list or a glossary:

First Term: This is the definition of the first term.
Second Term: This is the definition of the second term.

Last modified: 10 March 2024