Mirrors/tips
2
0
Fork 0
mirror of https://github.com/git-tips/tips synced 2024-11-10 05:44:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #215 from arnabnandy7/add-tips-python-env

Browse source 
Fix:git checkout -- <file_name> is incorrect #177
This commit is contained in:
hemanth.hm 2023-05-02 08:11:11 -07:00 committed by GitHub
commit 1c23d34fbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 364 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -334,7 +334,7 @@ git tag -d <tag-name>
git push origin :refs/tags/<tag-name>
```
## Undo local changes with the last content in head
## Undo local changes with the content in index(staging)
```sh
git checkout -- <file_name>
```

365
package-lock.json generated
View file

@ -1,365 +1,8 @@
{
"name": "tips",
"version": "1.0.0",
"lockfileVersion": 2,
"lockfileVersion": 1,
"requires": true,
"packages": {
"": {
"version": "1.0.0",
"license": "MIT",
"devDependencies": {
"doxie": "^0.2.2",
"doxie.append": "^0.1.0",
"doxie.inject": "^0.1.1",
"doxie.output": "^0.3.0",
"doxie.render": "^0.3.0",
"husky": "^0.8.1"
}
},
"node_modules/1-liners": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/1-liners/-/1-liners-0.3.6.tgz",
"integrity": "sha1-SDD+eLdTejaZ+IpdQqjtwa9mB/8=",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/101": {
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/101/-/101-1.6.3.tgz",
"integrity": "sha512-4dmQ45yY0Dx24Qxp+zAsNLlMF6tteCyfVzgbulvSyC7tCyd3V8sW76sS0tHq8NpcbXfWTKasfyfzU1Kd86oKzw==",
"dev": true,
"dependencies": {
"clone": "^1.0.2",
"deep-eql": "^0.1.3",
"keypather": "^1.10.2"
}
},
"node_modules/ansi-regex": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/array-find": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
"integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
"dev": true
},
"node_modules/base64-js": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz",
"integrity": "sha1-Ak8Pcq+iW3X5wO5zzU9V7Bvtl4Q=",
"dev": true,
"engines": {
"node": ">= 0.4"
}
},
"node_modules/bops": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/bops/-/bops-0.0.6.tgz",
"integrity": "sha1-CC0dVfoB5g29wuvC26N/ZZVUzzo=",
"dev": true,
"dependencies": {
"base64-js": "0.0.2",
"to-utf8": "0.0.1"
}
},
"node_modules/chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"dependencies": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
"has-ansi": "^2.0.0",
"strip-ansi": "^3.0.0",
"supports-color": "^2.0.0"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/clone": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
"dev": true,
"engines": {
"node": ">=0.8"
}
},
"node_modules/concat-stream": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.2.1.tgz",
"integrity": "sha1-81EAtsRjeL+6i2uA+fDQzN8T3GA=",
"dev": true,
"engines": [
"node >= 0.8.0"
],
"dependencies": {
"bops": "0.0.6"
}
},
"node_modules/deep-eql": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
"integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
"dev": true,
"dependencies": {
"type-detect": "0.1.1"
},
"engines": {
"node": "*"
}
},
"node_modules/defined": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
"dev": true
},
"node_modules/doxie": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/doxie/-/doxie-0.2.4.tgz",
"integrity": "sha1-KZltv1dg/OdNvLTXnGAjHYoXu4U=",
"dev": true,
"dependencies": {
"1-liners": "^0.3.2",
"chalk": "^1.0.0",
"doxie-core": "^0.3.1",
"stream-to-json": "^0.0.1",
"tiny-error": "^0.2.1"
},
"bin": {
"doxie": "bin/doxie.js"
}
},
"node_modules/doxie-core": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/doxie-core/-/doxie-core-0.3.1.tgz",
"integrity": "sha1-PS+RQ+WF45Cpgwjcnk7zjxPPQss=",
"dev": true,
"dependencies": {
"1-liners": "^0.3.0",
"chalk": "^1.0.0",
"tiny-error": "^0.2.1"
}
},
"node_modules/doxie.append": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/doxie.append/-/doxie.append-0.1.0.tgz",
"integrity": "sha1-yHRoUEL18wlKTQwzNsPklMNpdOE=",
"dev": true,
"dependencies": {
"object-assign": "^3.0.0"
}
},
"node_modules/doxie.append/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/doxie.inject": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/doxie.inject/-/doxie.inject-0.1.1.tgz",
"integrity": "sha1-/QNYT4segOZEtcuUdpr+RH94oEc=",
"dev": true,
"dependencies": {
"1-liners": "^0.3.2",
"array-find": "^1.0.0",
"chalk": "^1.0.0",
"defined": "^1.0.0",
"object-assign": "^3.0.0",
"tiny-error": "^0.2.1"
}
},
"node_modules/doxie.inject/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/doxie.output": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/doxie.output/-/doxie.output-0.3.0.tgz",
"integrity": "sha1-4H4Stn2qX8KLPsZn0HAv1ziZitE=",
"dev": true,
"dependencies": {
"1-liners": "^0.3.0",
"object-assign": "^3.0.0"
}
},
"node_modules/doxie.output/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/doxie.render": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/doxie.render/-/doxie.render-0.3.2.tgz",
"integrity": "sha1-Mva37g88NSSokT08grn6uqoKGPA=",
"dev": true,
"dependencies": {
"1-liners": "^0.3.1",
"chalk": "^1.0.0",
"object-assign": "^3.0.0",
"tiny-error": "^0.2.1"
}
},
"node_modules/doxie.render/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
"dev": true,
"engines": {
"node": ">=0.8.0"
}
},
"node_modules/has-ansi": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
"dev": true,
"dependencies": {
"ansi-regex": "^2.0.0"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/husky": {
"version": "0.8.1",
"resolved": "https://registry.npmjs.org/husky/-/husky-0.8.1.tgz",
"integrity": "sha1-7MeXuMTGiToz9IcDvJeppeUNhg8=",
"dev": true,
"hasInstallScript": true
},
"node_modules/keypather": {
"version": "1.10.2",
"resolved": "https://registry.npmjs.org/keypather/-/keypather-1.10.2.tgz",
"integrity": "sha1-4ESWMtSz5RbyHMAUznxWRP3c5hQ=",
"dev": true,
"dependencies": {
"101": "^1.0.0"
}
},
"node_modules/object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/once": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
"integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
"dev": true,
"dependencies": {
"wrappy": "1"
}
},
"node_modules/stream-to-json": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/stream-to-json/-/stream-to-json-0.0.1.tgz",
"integrity": "sha1-8DDyt47TjkkpPbiFZTarzCZ3FHM=",
"dev": true,
"dependencies": {
"concat-stream": "~1.2.0",
"once": "~1.3.0"
}
},
"node_modules/strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"dependencies": {
"ansi-regex": "^2.0.0"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
"dev": true,
"engines": {
"node": ">=0.8.0"
}
},
"node_modules/tiny-error": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/tiny-error/-/tiny-error-0.2.3.tgz",
"integrity": "sha1-KHas/leFGwcUMTwVNd/HBgp8Cbs=",
"dev": true,
"dependencies": {
"101": "^1.0.0",
"object-assign": "^4.0.1"
}
},
"node_modules/to-utf8": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz",
"integrity": "sha1-0Xrqcv8vujm55DYBvns/9y4ImFI=",
"dev": true
},
"node_modules/type-detect": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
"integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=",
"dev": true,
"engines": {
"node": "*"
}
},
"node_modules/wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true
}
},
"dependencies": {
"101": {
"version": "1.6.3",
@ -572,9 +215,9 @@
}
},
"husky": {
"version": "0.8.1",
"resolved": "https://registry.npmjs.org/husky/-/husky-0.8.1.tgz",
"integrity": "sha1-7MeXuMTGiToz9IcDvJeppeUNhg8=",
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/husky/-/husky-5.2.0.tgz",
"integrity": "sha512-AM8T/auHXRBxlrfPVLKP6jt49GCM2Zz47m8G3FOMsLmTv8Dj/fKVWE0Rh2d4Qrvmy131xEsdQnb3OXRib67PGg==",
"dev": true
},
"keypather": {

2
package.json
View file

@ -33,6 +33,6 @@
"doxie.inject": "^0.1.1",
"doxie.output": "^0.3.0",
"doxie.render": "^0.3.0",
"husky": "^0.8.1"
"husky": "^5.0.9"
}
}

2
tips.json
View file

@ -75,7 +75,7 @@
"title": "Delete remote tag",
"tip": "git push origin :refs/tags/<tag-name>"
}, {
"title": "Undo local changes with the last content in head",
"title": "Undo local changes with the content in index(staging)",
"tip": "git checkout -- <file_name>"
}, {
"title": "Revert: Undo a commit by creating a new commit",