2015-07-15 12:25:24 +02:00
|
|
|
## Overwrite pull
|
2015-07-15 09:26:27 +02:00
|
|
|
|
|
|
|
```sh
|
|
|
|
git fetch --all
|
|
|
|
git reset --hard origin/master
|
|
|
|
```
|
|
|
|
|
2015-07-15 12:25:24 +02:00
|
|
|
## List of all the files changed in a commit
|
2015-07-15 09:26:27 +02:00
|
|
|
|
|
|
|
```sh
|
|
|
|
git ls-tree --name-only -r <commit-ish>
|
|
|
|
```
|
|
|
|
|
2015-07-15 12:25:24 +02:00
|
|
|
## Git reset first commit
|
2015-07-15 09:26:27 +02:00
|
|
|
|
|
|
|
```sh
|
|
|
|
git update-ref -d HEAD
|
|
|
|
```
|
|
|
|
|
2015-07-15 12:25:24 +02:00
|
|
|
## List all the conflicted files
|
2015-07-15 09:26:27 +02:00
|
|
|
|
|
|
|
```sh
|
|
|
|
git diff --name-only --diff-filter=U
|
|
|
|
```
|
2015-07-15 09:40:18 +02:00
|
|
|
|
2015-07-15 12:25:24 +02:00
|
|
|
## List all branches that are already merged into master
|
2015-07-15 09:35:57 +02:00
|
|
|
|
|
|
|
```sh
|
|
|
|
git checkout master
|
|
|
|
git branch --merged
|
|
|
|
```
|
|
|
|
|
2015-07-15 12:25:24 +02:00
|
|
|
## Quickly switch to the previous branch
|
2015-07-15 09:35:57 +02:00
|
|
|
|
|
|
|
```sh
|
|
|
|
git checkout -
|
|
|
|
```
|
|
|
|
|
2015-07-15 09:40:18 +02:00
|
|
|
# Remove branches that have already been merged with master
|
|
|
|
```sh
|
|
|
|
git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d
|
|
|
|
```
|
2015-07-15 12:29:20 +02:00
|
|
|
|
2015-07-15 12:25:24 +02:00
|
|
|
## List all branches and their upstreams, as well as last commit on branch
|
2015-07-15 09:35:57 +02:00
|
|
|
|
2015-07-15 12:24:22 +02:00
|
|
|
```sh
|
|
|
|
git branch -vv
|
|
|
|
```
|
2015-07-15 09:35:57 +02:00
|
|
|
|
2015-07-15 12:25:24 +02:00
|
|
|
## Track upstream branch
|
2015-07-15 12:24:22 +02:00
|
|
|
|
|
|
|
```sh
|
|
|
|
git branch -u origin/mybranch
|
2015-07-15 12:29:20 +02:00
|
|
|
```
|