git-tips/README.md

55 lines
796 B
Markdown
Raw Normal View History

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