https://github.com/diegaccio/git-cheatsheet
Git command line cheatsheet
https://github.com/diegaccio/git-cheatsheet
command command-line git
Last synced: 2 months ago
JSON representation
Git command line cheatsheet
- Host: GitHub
- URL: https://github.com/diegaccio/git-cheatsheet
- Owner: diegaccio
- Created: 2025-01-13T08:47:49.000Z (over 1 year ago)
- Default Branch: main
- Last Pushed: 2025-01-29T09:07:32.000Z (over 1 year ago)
- Last Synced: 2025-01-29T10:22:31.641Z (over 1 year ago)
- Topics: command, command-line, git
- Homepage: https://diegaccio.github.io/git-cheatsheet/
- Size: 32.2 KB
- Stars: 0
- Watchers: 1
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# Git Command Line Cheat Sheet
## Table of Contents
- [Configuration](#configuration)
- [Creating Snapshots](#creating-snapshots)
- [Browsing History](#browsing-history)
- [Branching & Merging](#branching--merging)
- [Working with remote repositories](#working-with-remote-repositories)
- [Rewriting History](#rewriting-history)
- [Powerful Aliases](#powerful-aliases)
## Configuration
### Global vs Local
```
git config --global #settings for the current user
git config --local #settings for the current folder
```
### Showing the configuration
```
git config --global -l
```
### User
```
git config --global user.name "John Smith" #sets the user name
git config --global user.email "johnsmith@gmail.com" #sets the user email
```
### Editor
```
git config --global core.editor "code --wait" # Sets the default editor to vscode
git config --global -e # Opens the global config file in the default editor
```
### Merge and Diff tool
To setup p4merge as diff and merge tool on macOS, install it using brew:
```
brew install --cask p4v
```
Then add this sections to your git confi file:
```
[diff]
tool = p4merge
[difftool "p4merge"]
path = /Applications/p4merge.app/Contents/Resources/launchp4merge
[difftool]
prompt = false
[merge]
tool = p4merge
[mergetool "p4merge"]
path = /Applications/p4merge.app/Contents/Resources/launchp4merge
[mergetool]
prompt = false
keepBackup = false
```
## Creating Snapshots
### Initializing a repository
```
git init
```
### Staging files
```
git add file1.js # Stages a single file
git add file1.js file2.js # Stages multiple files
git add *.js # Stages with a pattern
git add . # Stages the current directory and all its content
```
### Viewing the status
```
git status # Full status
git status -s # Short status
```
### Committing the staged files
```
git commit -m "Message" # Commits with a one-line message
git commit # Opens the default editor to type a long message
```
### Skipping the staging area
```
git commit -am "Message"
```
### Removing files
```
git rm file1.js # Removes from working directory and staging area
git rm --cached file1.js # Removes from staging area only
```
### Renaming or moving files
```
git mv file1.js file1.txt
```
### Viewing the staged/unstaged changes
```
git diff # Shows unstaged changes
git diff file.txt # Shows unstaged changes for a single file
git diff --staged # Shows staged changes
git diff --cached # Same as the above
```
### Viewing a commit
```
git show 921a2ff # Shows the given commit
git show HEAD # Shows the last commit
git show HEAD~2 # Two steps before the last commit
git show HEAD:file.js # Shows the version of file.js stored in the last commit
```
### Unstaging files (undoing git add)
```
git restore --staged file.js # Copies the last version of file.js from repo to index
```
### Discarding local changes
```
git restore file.js # Copies file.js from index to working directory
git restore file1.js file2.js # Restores multiple files in working directory
git restore . # Discards all local changes (except untracked files)
git clean -fd # Removes all untracked files
```
### Restoring an earlier version of a file
```
git restore --source=HEAD~2 file.js
```
## Browsing History
### Viewing the history
```
git log # Full history
git log --oneline # Summary
git log --reverse # Lists the commits from the oldest to the newest
git log --stat # Shows the list of modified files
git log --patch # Shows the actual changes (patches)
```
### Filtering the history
```
git log -3 # Shows the last 3 entries
git log --author="Diego"
git log --before="2024-08-17"
git log --after="one week ago"
git log --grep="GUI" # Commits with "GUI" in their message
git log -S"GUI" # Commits with "GUI" in their patches
git log hash1..hash2 # Range of commits
git log file.txt # Commits that touched file.txt
```
### Formatting the log output
```
git log --pretty=format:"%an committed %H"
```
### Creating an alias
```
git config --global alias.lg "log --oneline"
```
### Viewing a commit
```
git show HEAD~2 # Shows the second commit after HEAD
git show HEAD~2:file1.txt # Shows the version of file stored in this commit
```
### Comparing commits
```
git diff HEAD~2 HEAD # Shows the changes between two commits
git diff HEAD~2 HEAD file.txt # Changes to file.txt only
```
### Checking out a commit
```
git checkout dad47ed # Checks out the given commit
git checkout master # Checks out the master branch
```
### Finding a bad commit
```
git bisect start # Starts the bisect session
git bisect bad # Marks the current commit as a bad commit
git bisect good ca49180 # Marks the given commit as a good commit
git bisect reset # Terminates the bisect session
```
### Finding contributors
```
git shortlog
git shortlog -s # shows the number of contributions for each user
```
### Viewing the history of a file
```
git log file.txt # Shows the commits that touched file.txt
git log --stat file.txt # Shows statistics (the number of changes) for file.txt
git log --patch file.txt # Shows the patches (changes) applied to file.txt
```
### Finding the author of lines
```
git blame file.txt # Shows the author of each line in file.txt
```
### Tagging
```
git tag v1.0 # Tags the last commit as v1.0
git tag v1.0 5e7a828 # Tags an earlier commit
git tag # Lists all the tags
git tag -d v1.0 # Deletes the given tag
```
## Branching & Merging
### Managing branches
```
git branch bugfix # Creates a new branch called bugfix
git checkout bugfix # Switches to the bugfix branch
git switch bugfix # Same as the above (newer command)
git switch -C bugfix # Creates and switches
git branch -d bugfix # Deletes the bugfix branch
```
### Comparing branches
```
git log master..bugfix # Lists the commits in the bugfix branch not in master
git diff master..bugfix # Shows the summary of changes
```
### Stashing
```
git stash push -m "Shash" # Creates a new stash
git stash list # Lists all the stashes
git stash show stash@{1} # Shows the given stash
git stash show 1 # shortcut for stash@{1}
git stash apply 1 # Applies the given stash to the working dir
git stash drop 1 # Deletes the given stash
git stash clear # Deletes all the stashes
```
### Merging
```
git merge bugfix # Merges the bugfix branch into the current branch
git merge --no-ff bugfix # Creates a merge commit even if FF is possible
git merge --squash bugfix # Performs a squash merge
git merge --abort # Aborts the merge
```
### Viewing the merged branches
```
git branch --merged # Shows the merged branches
git branch --no-merged # Shows the unmerged branches
```
### Rebasing
```
git rebase master # Changes the base of the current branch - it rewrites history so be careful with shared work
```
### Cherry picking
```
git cherry-pick dad47ed # Applies the given commit on the current branch
```
## Working with remote repositories
### Cloning a repository
```
git clone url #clones the repository in the current directory
```
### Syncing with remotes
```
git fetch origin master # Fetches master from origin
git fetch origin # Fetches all objects from origin
git fetch # Shortcut for "git fetch origin"
git pull # Fetch + merge
git push origin master # Pushes master to origin
git push # Shortcut for "git push origin master"
```
### Sharing tags
```
git push origin v1.0 # Pushes tag v1.0 to origin
git push origin -delete v1.0 # deletes the tag
```
### Sharing branches
```
git branch -r # Shows remote tracking branches
git branch -vv # Shows local & remote tracking branches
git push -u origin bugfix # Pushes bugfix to origin
git push -d origin bugfix # Removes bugfix from origin
```
### Managing remotes
```
git remote -v # Shows remote repos
git remote add upstream url # Adds a new remote called upstream
git remote rm upstream # Remotes upstream
git remote show origin # Shows the mapping of the local branches to the remote branches
git branch -u origin/serverfix # Branch serverfix set up to track remote branch serverfix from origin.
```
### Configuring a remote repository for a fork (i.e. GitHub contribution)
You must configure a remote that points to the upstream repository in Git to sync changes you make in a fork with the original repository (**Pull Request**). This also allows you to sync changes made in the original repository with the fork.
List the current configured remote repository for your fork:
```
$ git remote -v
> origin https://github.com/YOUR-USERNAME/YOUR-FORK.git (fetch)
> origin https://github.com/YOUR-USERNAME/YOUR-FORK.git (push)
```
Specify a new remote upstream repository that will be synced with the fork:
```
git remote add upstream https://github.com/ORIGINAL-OWNER/ORIGINAL-REPOSITORY.git
```
Verify the new upstream repository you've specified for your fork:
```
$ git remote -v
> origin https://github.com/YOUR-USERNAME/YOUR-FORK.git (fetch)
> origin https://github.com/YOUR-USERNAME/YOUR-FORK.git (push)
> upstream https://github.com/ORIGINAL-OWNER/ORIGINAL-REPOSITORY.git (fetch)
> upstream https://github.com/ORIGINAL-OWNER/ORIGINAL-REPOSITORY.git (push)
```
## Rewriting History
Please avoid **Rewriting Shared History**: only rewrite history in private branches or before pushing changes to the remote.
Use git revert Instead: To fix mistakes in a public branch, create new commits that undo or adjust previous changes without altering the existing history.
These practices help maintain a clear and consistent history, minimizing disruptions for collaborators.
### Undoing commits
```
git reset --soft HEAD^ # Removes the last commit, keeps changed staged
git reset --mixed HEAD^ # Unstages the changes as well
git reset --hard HEAD^ # Discards local changes
```
### Reverting commits
```
git revert 72856ea # Reverts the given commit
git revert HEAD~3.. # Reverts the last three commits
git revert --no-commit HEAD~3..
```
### Recovering lost commits
```
git reflog # Shows the history of HEAD
git reflog show bugfix # Shows the history of bugfix pointer
```
### Amending the last commit
```
git commit --amend
```
### Interactive rebasing
```
git rebase -i HEAD~5 #starts the interactive rebase at the fifth commit befor HEAD
```
## Powerful Aliases
### Adding alias from command line
```
git config --global alias.st status #add a new line to the [alias] section of your global config
```
### Editing the global .gitconfi file
Open the global config file in the default editor:
```
git config --global -e
```
And add this section:
```
[alias]
st = status
```
### The lazy typer
```
[alias]
s = status
st = status
c = commit
sw = switch
br = branch
```
### Common Typos
```
[alias]
comit = commit
swicht = switch
statut = status
```
### Speedy commands
```
[alias]
cam = git commit -am #stage all and commit with message
dlc = diff --cached HEAD^ # Diff of last commit
aliases = config --get-regexp alias # list all defined aliases
first = rev-list --max-parents=0 HEAD # Find very first commit
incoming = log HEAD..@{upstream} # what would be merged
gitoutgoing = log @{upstream}..HEAD # what would be pushed
```
### Pretty formats
Add this section to your .gitconfig file:
```
[pretty]
slog = format:%C(yellow)%h %Cred%as %Cblue%an%Cgreen%d %Creset%s
bw = format:%h | %as | %>(20,trunc)%d%x09%s
```
Then you can use this alias:
```
[alias]
l1 = log -1 --pretty=slog
l5 = log -5 --pretty=slog
slog = log --pretty=slog
slogbw = log --pretty=bw
glog = log --graph --pretty=slog
outgoing = log --pretty=slog @{u}..
```