2015-07-15 07:26:27 +00:00
|
|
|
# Overwrite pull
|
|
|
|
|
|
|
|
```sh
|
|
|
|
git fetch --all
|
|
|
|
git reset --hard origin/master
|
|
|
|
```
|
|
|
|
|
|
|
|
# List of all the files changed in a commit
|
|
|
|
|
|
|
|
```sh
|
|
|
|
git ls-tree --name-only -r <commit-ish>
|
|
|
|
```
|
|
|
|
|
|
|
|
# Git reset first commit
|
|
|
|
|
|
|
|
```sh
|
|
|
|
git update-ref -d HEAD
|
|
|
|
```
|
|
|
|
|
|
|
|
# List all the conflicted files
|
|
|
|
|
|
|
|
```sh
|
|
|
|
git diff --name-only --diff-filter=U
|
|
|
|
```
|
2015-07-15 07:35:57 +00:00
|
|
|
|
|
|
|
# List all branches that are already merged into master
|
|
|
|
|
|
|
|
```sh
|
|
|
|
git checkout master
|
|
|
|
git branch --merged
|
|
|
|
```
|
|
|
|
|
|
|
|
# Quickly switch to the previous branch
|
|
|
|
|
|
|
|
```sh
|
|
|
|
git checkout -
|
|
|
|
```
|
|
|
|
|
2015-07-15 10:24:22 +00:00
|
|
|
# List all branches and their upstreams, as well as last commit on branch
|
2015-07-15 07:35:57 +00:00
|
|
|
|
2015-07-15 10:24:22 +00:00
|
|
|
```sh
|
|
|
|
git branch -vv
|
|
|
|
```
|
2015-07-15 07:35:57 +00:00
|
|
|
|
2015-07-15 10:24:22 +00:00
|
|
|
# Track upstream branch
|
|
|
|
|
|
|
|
```sh
|
|
|
|
git branch -u origin/mybranch
|
|
|
|
```
|