knowledge/git-tips
1
0
Fork 0
mirror of https://github.com/namibia/tips.git synced 2024-05-30 08:51:12 +00:00
Code Issues Releases Activity

Merge pull request #4 from tstringer/master

Browse Source 
Upstream additions and header changes
This commit is contained in:
hemanth.hm 2015-07-15 15:58:35 +05:30
commit f39b1a6853
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.md
View File

@ -1,40 +1,49 @@
# Overwrite pull
## Overwrite pull
```sh
git fetch --all
git reset --hard origin/master
```
# List of all the files changed in a commit
## List of all the files changed in a commit
```sh
git ls-tree --name-only -r <commit-ish>
```
# Git reset first commit
## Git reset first commit
```sh
git update-ref -d HEAD
```
# List all the conflicted files
## List all the conflicted files
```sh
git diff --name-only --diff-filter=U
```
# List all branches that are already merged into master
## List all branches that are already merged into master
```sh
git checkout master
git branch --merged
```
# Quickly switch to the previous branch
## Quickly switch to the previous branch
```sh
git checkout -
```
## List all branches and their upstreams, as well as last commit on branch
```sh
git branch -vv
```
## Track upstream branch
```sh
git branch -u origin/mybranch
```