tips/README.md

93 lines
3.1 KiB
Markdown
Raw Normal View History

2015-07-15 11:17:39 +00:00
## git-tips
> Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md)
2015-07-15 11:01:27 +00:00
<!-- @doxie.inject start toc -->
<!-- Dont remove or change the comment above that can break automatic updates. -->
2015-07-15 14:46:49 +00: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 15:05:53 +00: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 14:46:49 +00: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-16 03:37:15 +00:00
* [Undo local changes with the last content in head](https://github.com/git-tips/tips#Undo-local-changes-with-the-last-content-in-head)
* [Changing a remote's URL](https://github.com/git-tips/tips#Changing-a-remotes-URL)
2015-07-15 11:01:27 +00:00
<!-- Dont 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 -->
<!-- Dont remove or change the comment above that can break automatic updates. -->
## Overwrite pull
2015-07-15 07:26:27 +00:00
```sh
2015-07-15 11:01:27 +00:00
git fetch --all && git reset --hard origin/master
2015-07-15 07:26:27 +00:00
```
## 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
2015-07-15 11:01:27 +00:00
git checkout master && git branch --merged
2015-07-15 07:35:57 +00:00
```
## Quickly switch to the previous branch
2015-07-15 07:35:57 +00:00
```sh
git checkout -
```
2015-07-15 11:01:27 +00:00
## Remove branches that have already been merged with master
```sh
2015-07-15 11:01:27 +00:00
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
```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
```
2015-07-15 11:01:27 +00:00
2015-07-15 14:37:46 +00:00
## Delete local branch
```sh
2015-07-16 03:37:15 +00:00
git branch -d <local_branchname>
2015-07-15 14:37:46 +00:00
```
## Delete remote branch
```sh
2015-07-16 03:37:15 +00:00
git push origin :<remote_branchname>
```
## Undo local changes with the last content in head
```sh
git checkout -- <file_name>
```
## Changing a remote's URL
```sh
git remote set-url origin <URL>
2015-07-15 14:37:46 +00:00
```
2015-07-15 11:01:27 +00:00
<!-- Dont remove or change the comment below that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end -->