diff --git a/README.md b/README.md index fcf5404..e456f6f 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,12 @@ git ls-tree --name-only -r git update-ref -d HEAD ``` + +__Alternatives:__ +```sh +git reset --hard HEAD +``` + ## List all the conflicted files ```sh git diff --name-only --diff-filter=U diff --git a/tips.json b/tips.json index 85c762d..183a8d6 100644 --- a/tips.json +++ b/tips.json @@ -12,7 +12,8 @@ "tip": "git ls-tree --name-only -r " }, { "title": "Git reset first commit", - "tip": "git update-ref -d HEAD" + "tip": "git update-ref -d HEAD", + "alternatives": ["git reset --hard HEAD"] }, { "title": "List all the conflicted files", "tip": "git diff --name-only --diff-filter=U"