Marown/tips
1
0
Fork 0
mirror of https://github.com/git-tips/tips.git synced 2024-09-21 00:01:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
Hemanth.HM 2015-07-15 15:59:20 +05:30
commit dd2031c387
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
README.md
View File

@ -1,36 +1,36 @@
# Overwrite pull ## Overwrite pull
```sh ```sh
git fetch --all git fetch --all
git reset --hard origin/master git reset --hard origin/master
``` ```
# List of all the files changed in a commit ## List of all the files changed in a commit
```sh ```sh
git ls-tree --name-only -r <commit-ish> git ls-tree --name-only -r <commit-ish>
``` ```
# Git reset first commit ## Git reset first commit
```sh ```sh
git update-ref -d HEAD git update-ref -d HEAD
``` ```
# List all the conflicted files ## List all the conflicted files
```sh ```sh
git diff --name-only --diff-filter=U 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 ```sh
git checkout master git checkout master
git branch --merged git branch --merged
``` ```
# Quickly switch to the previous branch ## Quickly switch to the previous branch
```sh ```sh
git checkout - git checkout -
@ -40,3 +40,15 @@ git checkout -
```sh ```sh
git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d
``` ```
## 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
```