1
0
mirror of https://github.com/namibia/tips.git synced 2024-12-23 02:28:58 +00:00

wrong alternatives were removed

This commit is contained in:
Hemanth.HM 2016-08-29 10:54:26 +05:30
parent 9d7a837add
commit dca76041d8
2 changed files with 1 additions and 8 deletions

View File

@ -171,12 +171,6 @@ git ls-tree --name-only -r <commit-ish>
git update-ref -d HEAD
```
__Alternatives:__
```sh
git reset --hard HEAD
```
## List all the conflicted files
```sh
git diff --name-only --diff-filter=U

View File

@ -12,8 +12,7 @@
"tip": "git ls-tree --name-only -r <commit-ish>"
}, {
"title": "Git reset first commit",
"tip": "git update-ref -d HEAD",
"alternatives": ["git reset --hard HEAD"]
"tip": "git update-ref -d HEAD"
}, {
"title": "List all the conflicted files",
"tip": "git diff --name-only --diff-filter=U"