Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
https://github.com/yuanqing/git-cheatsheet
:deciduous_tree: A handy list of commonly used Git commands
https://github.com/yuanqing/git-cheatsheet
cheatsheet git
Last synced: 10 days ago
JSON representation
:deciduous_tree: A handy list of commonly used Git commands
- Host: GitHub
- URL: https://github.com/yuanqing/git-cheatsheet
- Owner: yuanqing
- Created: 2014-11-29T14:30:57.000Z (almost 10 years ago)
- Default Branch: main
- Last Pushed: 2021-03-30T10:55:29.000Z (over 3 years ago)
- Last Synced: 2023-08-10T22:42:57.784Z (about 1 year ago)
- Topics: cheatsheet, git
- Homepage:
- Size: 5.86 KB
- Stars: 6
- Watchers: 2
- Forks: 5
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# Git Cheatsheet
> A handy list of commonly used Git commands
## Commands
### Create new or download existing repository
```sh
# Initialize a new repository
$ git init
$ git remote add origin https://github.com/foo/bar.git
# Download an existing remote repository
$ git clone https://github.com/foo/bar.git
```
### Sync local repository with remote
```sh
# Sync with the remote branch
$ git fetch
# Sync with the remote branch, and merge it into the local branch
$ git pull
```
### Branching
```sh
# List all branches
$ git branch
# Create a new branch
$ git branch hotfix
# Switch to a branch
$ git checkout hotfix
# Create a new branch, and switch to it
$ git checkout -b hotfix
# Delete a local branch
$ git branch -D hotfix
# Delete a remote branch
$ git push origin :hotfix
# Merge one branch into another
$ git checkout main
$ git merge hotfix
# Merge one branch into another as a single commit
$ git checkout main
$ git merge --squash hotfix
```
### Tagging
```sh
# List all tags
$ git tag
# Tag a commit
$ git tag -a v1.0.0 ea506f6c2c -m '1.0.0'
# Delete a tag
$ git tag -d v1.0.0
```
### Stage changes
```sh
# Stage a modified or untracked file
$ git add foo
# Stage a deleted file
$ git rm foo
# Stage all modified or untracked files, ignoring deleted files
$ git add .
# Stage all modified or deleted files, ignoring untracked files
$ git add -u
```
### Unstage changes
```sh
# Unstage a single file
$ git reset foo
# Unstage all files
$ git reset -- .
# Restore a single file from the last commit
$ git checkout foo
# Restore all files from the last commit
$ git checkout -- .
# Delete all untracked files
$ git clean -df
```
### Review changes
```sh
# See unstaged changes made to a single file
$ git diff foo
# See unstaged changes made to all files
$ git diff
# See staged changes made to all files
$ git diff --cached
# Compare the last and second-last commits
$ git diff HEAD^ HEAD
```
### Commit changes
```sh
# List commit history
$ git log
# Make a commit
$ git commit -m 'foo'
# Amend the last commit message
$ git commit --amend -m 'bar'
# Amend the last commit message after having done a `git push`
$ git commit --amend -m 'bar'
$ git push origin +main
# Delete the last commit
$ git reset --soft HEAD~1
# Delete the last commit, and unstage all files
$ git reset --soft HEAD~1
$ git reset -- .
# Delete the last commit after having done a `git push`
$ git reset --soft HEAD~1
$ git push origin +main
# Delete commits from history (eg. delete commits 2 and 4)
#
# commit 1: 1ebc709 (keep)
# commit 2: 2de6867
# commit 3: 3eba02b (keep)
# commit 4: 4b632b2
# commit 5: 56098c5 (keep)
#
$ git checkout 56098c5 # commit 5
$ git checkout -b repair
$ git cherry-pick 3eba02b # commit 3
$ git cherry-pick 1ebc709 # commit 1
$ git checkout main
$ git reset --hard 56098c5 # commit 5
$ git merge repair
$ git branch -D repair
$ git push origin +main
# Merge multiple commits (eg. the last 3 commits) into one
#
# 1. Mark all commits other than the first with `squash`, then save and quit.
# 2. Enter a new commit message, then save and quit.
#
$ git rebase -i HEAD~3
```
### Push changes to remote
```sh
# Push changes
$ git push origin main
# Push changes, overriding the remote
$ git push origin +main
# Push tags
$ git push --tags origin main
```
## References
- [Oh Shit, Git!?!](https://ohshitgit.com/)
- [Delete commits from history](https://stackoverflow.com/a/46049102)