2015-07-15 13:17:39 +02:00
## git-tips
> Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md)
2015-07-15 13:01:27 +02:00
<!-- @doxie .inject start toc -->
<!-- Don’ t remove or change the comment above – that can break automatic updates. -->
2015-07-15 16:46:49 +02:00
* [Overwrite pull ](https://github.com/git-tips/tips#Overwrite-pull )
* [List of all the files changed in a commit ](https://github.com/git-tips/tips#List-of-all-the-files-changed-in-a-commit )
* [Git reset first commit ](https://github.com/git-tips/tips#Git-reset-first-commit )
* [List all the conflicted files ](https://github.com/git-tips/tips#List-all-the-conflicted-files )
* [List all branches that are already merged into master ](https://github.com/git-tips/tips#List-all-branches-that-are-already-merged-into-master )
* [Quickly switch to the previous branch ](https://github.com/git-tips/tips#Quickly-switch-to-the-previous-branch )
* [Remove branches that have already been merged with master ](https://github.com/git-tips/tips#Remove-branches-that-have-already-been-merged-with-master )
2015-07-15 17:05:53 +02:00
* [List all branches and their upstreams, as well as last commit on branch ](https://github.com/git-tips/tips#List-all-branches-and-their-upstreams-as-well-as-last-commit-on-branch )
2015-07-15 16:46:49 +02:00
* [Track upstream branch ](https://github.com/git-tips/tips#Track-upstream-branch )
* [Delete local branch ](https://github.com/git-tips/tips#Delete-local-branch )
* [Delete remote branch ](https://github.com/git-tips/tips#Delete-remote-branch )
2015-07-15 13:01:27 +02:00
<!-- Don’ t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie .inject end toc -->
<!-- @doxie .inject start -->
<!-- Don’ t remove or change the comment above – that can break automatic updates. -->
2015-07-15 12:25:24 +02:00
## Overwrite pull
2015-07-15 09:26:27 +02:00
```sh
2015-07-15 13:01:27 +02:00
git fetch --all & & git reset --hard origin/master
2015-07-15 09:26:27 +02:00
```
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
2015-07-15 13:01:27 +02:00
git checkout master & & git branch --merged
2015-07-15 09:35:57 +02:00
```
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 13:01:27 +02:00
## Remove branches that have already been merged with master
2015-07-15 09:40:18 +02:00
```sh
2015-07-15 13:01:27 +02:00
git branch --merged | grep -v '\*' | xargs -n 1 git branch -d
2015-07-15 09:40:18 +02:00
```
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 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
```
2015-07-15 13:01:27 +02:00
2015-07-15 16:37:46 +02:00
## Delete local branch
```sh
git branch -d local_branchname
```
## Delete remote branch
```sh
git push origin :remote_branchname
```
2015-07-15 13:01:27 +02:00
<!-- Don’ t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie .inject end -->