From e89eb24e670c6baf8d2c9944319323e5dc59bdd7 Mon Sep 17 00:00:00 2001 From: rednik96 Date: Sun, 3 May 2020 13:56:09 +0200 Subject: [PATCH 01/17] replacing `git stash save` by `git stash push` `git stash save` -> This option is deprecated in favour of git stash push. [git docs](https://git-scm.com/docs/git-stash#Documentation/git-stash.txt-save-p--patch-k--no-keep-index-u--include-untracked-a--all-q--quietltmessagegt) --- README.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0e69629..471ca71 100644 --- a/README.md +++ b/README.md @@ -442,7 +442,7 @@ git stash __Alternatives:__ ```sh -git stash save +git stash push ``` ## Saving current state of unstaged changes to tracked files @@ -458,7 +458,7 @@ git stash --keep-index ```sh -git stash save --keep-index +git stash push --keep-index ``` ## Saving current state including untracked files @@ -469,17 +469,23 @@ git stash -u __Alternatives:__ ```sh -git stash save -u +git stash push -u ``` ```sh -git stash save --include-untracked +git stash push --include-untracked ``` ## Saving current state with message ```sh -git stash save +git stash push -m +``` + + +__Alternatives:__ +```sh +git stash push --message ``` ## Saving current state of all files (ignored, untracked, and tracked) @@ -495,7 +501,7 @@ git stash --all ```sh -git stash save --all +git stash push --all ``` ## Show list of all saved stashes From 36c15874fd5196517b55a38c627f3dc5ffc84e43 Mon Sep 17 00:00:00 2001 From: biesiadamich <60202305+biesiadamich@users.noreply.github.com> Date: Thu, 7 May 2020 23:18:04 +0200 Subject: [PATCH 02/17] update readme (#185) added Polish link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e69629..fd5b47f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## git-tips > Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md) -[English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips) | [Русский](https://github.com/Imangazaliev/git-tips) | [한국어](https://github.com/mingrammer/git-tips) | [Tiếng Việt](https://github.com/hprobotic/git-tips) | [日本語](https://github.com/isotai/git-tips) | [नेपाली](https://github.com/amarduwal/git-tips) +[English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips) | [Русский](https://github.com/Imangazaliev/git-tips) | [한국어](https://github.com/mingrammer/git-tips) | [Tiếng Việt](https://github.com/hprobotic/git-tips) | [日本語](https://github.com/isotai/git-tips) | [नेपाली](https://github.com/amarduwal/git-tips) | [Polski](https://github.com/mbiesiad/tips) ### __Tools:__ From 8305c4a4c6534cd298588900a525740bafb971e9 Mon Sep 17 00:00:00 2001 From: Adrian Skar Date: Thu, 16 Jul 2020 17:41:10 +0200 Subject: [PATCH 03/17] alternatives: create and switch new branch Add alternative to `996 ## Create and switch new branch` using git switch ref: https://git-scm.com/docs/git-switch --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index fd5b47f..40015ee 100644 --- a/README.md +++ b/README.md @@ -974,6 +974,10 @@ __Alternatives:__ git branch && git checkout ``` +```sh +git switch -c +``` + ## Ignore file mode changes on commits ```sh git config core.fileMode false From 442d880d4cb869f05bdf8e81706e71e66e63edc4 Mon Sep 17 00:00:00 2001 From: Edy Cu Date: Thu, 30 Jul 2020 19:40:51 +0700 Subject: [PATCH 04/17] Fix typo extra caret in git command Restore delete file. --- README.md | 2 +- tips.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fd5b47f..050cc53 100644 --- a/README.md +++ b/README.md @@ -781,7 +781,7 @@ git clean -X -f ## Restore deleted file. ```sh -git checkout ^ -- +git checkout -- ``` ## Restore file to a specific commit-hash diff --git a/tips.json b/tips.json index 3400539..21c65a4 100644 --- a/tips.json +++ b/tips.json @@ -278,7 +278,7 @@ "tip": "git clean -X -f" }, { "title": "Restore deleted file.", - "tip": "git checkout ^ -- " + "tip": "git checkout -- " }, { "title": "Restore file to a specific commit-hash", "tip": "git checkout -- " From 767360112f4c6bc58e68eae96b93cd6bb886dade Mon Sep 17 00:00:00 2001 From: "Gaushik M.R" Date: Fri, 31 Jul 2020 10:14:03 -0400 Subject: [PATCH 05/17] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..e96f702 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at hemanth.hm@gmail.com. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq From d1835c92dfda88663fd444380a18b7f7b40ee875 Mon Sep 17 00:00:00 2001 From: Edy Cu Date: Tue, 25 Aug 2020 23:15:27 +0700 Subject: [PATCH 06/17] Split git variable to avoid confusion symbol vertical line for pipeline and OR --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fd5b47f..2533c89 100644 --- a/README.md +++ b/README.md @@ -1139,9 +1139,14 @@ git config [--global] --edit git blame -L , ``` -## Show a Git logical variable. +## List all Git variable. ```sh -git var -l | +git var -l +``` + +## Show a Git specific variable. +```sh +git var ``` ## Preformatted patch file. From 97047c7560a70e79b9a21ef691752ec22b9c8047 Mon Sep 17 00:00:00 2001 From: Adrian Skar Date: Sat, 19 Dec 2020 12:00:49 +0100 Subject: [PATCH 07/17] add[alternative]: create and switch branch From #186. --- tips.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tips.json b/tips.json index 21c65a4..b3fa5c6 100644 --- a/tips.json +++ b/tips.json @@ -380,7 +380,7 @@ }, { "title": "Create and switch new branch", "tip": "git checkout -b ", - "alternatives": ["git branch && git checkout "] + "alternatives": ["git branch && git checkout ", "git switch -c "] }, { "title": "Ignore file mode changes on commits", "tip": "git config core.fileMode false" From 6b2007ab79b29cf21f7b52c34089f374a4c796b2 Mon Sep 17 00:00:00 2001 From: rednik96 Date: Sun, 10 Jan 2021 11:41:46 +0100 Subject: [PATCH 08/17] Revert "replacing `git stash save` by `git stash push`" This reverts commit e89eb24e670c6baf8d2c9944319323e5dc59bdd7. --- README.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 471ca71..0e69629 100644 --- a/README.md +++ b/README.md @@ -442,7 +442,7 @@ git stash __Alternatives:__ ```sh -git stash push +git stash save ``` ## Saving current state of unstaged changes to tracked files @@ -458,7 +458,7 @@ git stash --keep-index ```sh -git stash push --keep-index +git stash save --keep-index ``` ## Saving current state including untracked files @@ -469,23 +469,17 @@ git stash -u __Alternatives:__ ```sh -git stash push -u +git stash save -u ``` ```sh -git stash push --include-untracked +git stash save --include-untracked ``` ## Saving current state with message ```sh -git stash push -m -``` - - -__Alternatives:__ -```sh -git stash push --message +git stash save ``` ## Saving current state of all files (ignored, untracked, and tracked) @@ -501,7 +495,7 @@ git stash --all ```sh -git stash push --all +git stash save --all ``` ## Show list of all saved stashes From 0eb60008aad02c301fe8bf8bb9d268dd3cb18e0e Mon Sep 17 00:00:00 2001 From: rednik96 Date: Sun, 10 Jan 2021 11:46:57 +0100 Subject: [PATCH 09/17] replacing `git stash save` by `git stash push` --- tips.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tips.json b/tips.json index 3400539..9ad6945 100644 --- a/tips.json +++ b/tips.json @@ -131,22 +131,23 @@ }, { "title": "Saving current state of tracked files without commiting", "tip": "git stash", - "alternatives": ["git stash save"] + "alternatives": ["git stash push"] }, { "title": "Saving current state of unstaged changes to tracked files", "tip": "git stash -k", - "alternatives": ["git stash --keep-index", "git stash save --keep-index"] + "alternatives": ["git stash --keep-index", "git stash push --keep-index"] }, { "title": "Saving current state including untracked files", "tip": "git stash -u", - "alternatives": ["git stash save -u", "git stash save --include-untracked"] + "alternatives": ["git stash push -u", "git stash push --include-untracked"] }, { "title": "Saving current state with message", - "tip": "git stash save " + "tip": "git stash push -m ", + "alternatives": ["git stash push --message "] }, { "title": "Saving current state of all files (ignored, untracked, and tracked)", "tip": "git stash -a", - "alternatives": ["git stash --all", "git stash save --all"] + "alternatives": ["git stash --all", "git stash push --all"] }, { "title": "Show list of all saved stashes", "tip": "git stash list" From 4f15d65b68c149ba244dc6a83fd2155f3d91b148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ni=20Marvaud?= <24732919+lmarvaud@users.noreply.github.com> Date: Thu, 18 Mar 2021 15:54:42 +0100 Subject: [PATCH 10/17] Add tips to delete local branches that has been squash and merged in the remote --- README.md | 37 +++-- package-lock.json | 359 +++++++++++++++++++++++++++++++++++++++++++++- tips.json | 5 +- 3 files changed, 384 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 4b9b20b..26dac9b 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,8 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Rebases 'feature' to 'master' and merges it in to master ](#rebases-feature-to-master-and-merges-it-in-to-master) * [Archive the `master` branch](#archive-the-master-branch) * [Modify previous commit without modifying the commit message](#modify-previous-commit-without-modifying-the-commit-message) -* [Prunes references to remote branches that have been deleted in the remote.](#prunes-references-to-remote-branches-that-have-been-deleted-in-the-remote) +* [Prunes references to remove branches that have been deleted in the remote.](#prunes-references-to-remove-branches-that-have-been-deleted-in-the-remote) +* [Delete local branches that has been squash and merged in the remote.](#delete-local-branches-that-has-been-squash-and-merged-in-the-remote) * [Retrieve the commit hash of the initial revision.](#retrieve-the-commit-hash-of-the-initial-revision) * [Visualize the version tree.](#visualize-the-version-tree) * [Visualize the tree including commits that are only referenced from reflogs](#visualize-the-tree-including-commits-that-are-only-referenced-from-reflogs) @@ -442,7 +443,7 @@ git stash __Alternatives:__ ```sh -git stash save +git stash push ``` ## Saving current state of unstaged changes to tracked files @@ -458,7 +459,7 @@ git stash --keep-index ```sh -git stash save --keep-index +git stash push --keep-index ``` ## Saving current state including untracked files @@ -469,17 +470,23 @@ git stash -u __Alternatives:__ ```sh -git stash save -u +git stash push -u ``` ```sh -git stash save --include-untracked +git stash push --include-untracked ``` ## Saving current state with message ```sh -git stash save +git stash push -m +``` + + +__Alternatives:__ +```sh +git stash push --message ``` ## Saving current state of all files (ignored, untracked, and tracked) @@ -495,7 +502,7 @@ git stash --all ```sh -git stash save --all +git stash push --all ``` ## Show list of all saved stashes @@ -645,7 +652,7 @@ git archive master --format=zip --output=master.zip git add --all && git commit --amend --no-edit ``` -## Prunes references to remote branches that have been deleted in the remote. +## Prunes references to remove branches that have been deleted in the remote. ```sh git fetch -p ``` @@ -656,6 +663,11 @@ __Alternatives:__ git remote prune origin ``` +## Delete local branches that has been squash and merged in the remote. +```sh +git branch -vv | grep ': gone]' | awk '{print }' | xargs git branch -D +``` + ## Retrieve the commit hash of the initial revision. ```sh git rev-list --reverse HEAD | head -1 @@ -1139,14 +1151,9 @@ git config [--global] --edit git blame -L , ``` -## List all Git variable. -```sh -git var -l -``` - -## Show a Git specific variable. +## Show a Git logical variable. ```sh -git var +git var -l | ``` ## Preformatted patch file. diff --git a/package-lock.json b/package-lock.json index 2ca1e1c..92e247e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,365 @@ { "name": "tips", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "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", diff --git a/tips.json b/tips.json index eea5b67..f823e40 100644 --- a/tips.json +++ b/tips.json @@ -216,9 +216,12 @@ "title": "Modify previous commit without modifying the commit message", "tip": "git add --all && git commit --amend --no-edit" }, { - "title": "Prunes references to remote branches that have been deleted in the remote.", + "title": "Prunes references to remove branches that have been deleted in the remote.", "tip": "git fetch -p", "alternatives": ["git remote prune origin"] + }, { + "title": "Delete local branches that has been squash and merged in the remote.", + "tip": "git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D" }, { "title": "Retrieve the commit hash of the initial revision.", "tip": " git rev-list --reverse HEAD | head -1", From ec4301cc2daa245b5a1d503ae9306704622ba910 Mon Sep 17 00:00:00 2001 From: Masahiko Shin Date: Tue, 4 May 2021 19:58:08 +0900 Subject: [PATCH 11/17] Add a tip to view what's in a stash --- README.md | 6 ++++++ tips.json | 3 +++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 26dac9b..a04546a 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Saving current state with message](#saving-current-state-with-message) * [Saving current state of all files (ignored, untracked, and tracked)](#saving-current-state-of-all-files-ignored-untracked-and-tracked) * [Show list of all saved stashes](#show-list-of-all-saved-stashes) +* [Show the contents of any stash in patch form](#show-the-contents-of-any-stash-in-patch-form) * [Apply any stash without deleting from the stashed list](#apply-any-stash-without-deleting-from-the-stashed-list) * [Apply last stashed state and delete it from stashed list](#apply-last-stashed-state-and-delete-it-from-stashed-list) * [Delete all stored stashes](#delete-all-stored-stashes) @@ -510,6 +511,11 @@ git stash push --all git stash list ``` +## Show the contents of any stash in patch form +```sh +git stash show -p +``` + ## Apply any stash without deleting from the stashed list ```sh git stash apply diff --git a/tips.json b/tips.json index f823e40..4bf8c7d 100644 --- a/tips.json +++ b/tips.json @@ -152,6 +152,9 @@ "title": "Show list of all saved stashes", "tip": "git stash list" }, { + "title": "Show the contents of any stash in patch form", + "tip": "git stash show -p " + }, { "title": "Apply any stash without deleting from the stashed list", "tip": "git stash apply " }, { From c8eb026a8617d7b78d3b2a360959e0a0bb571bfd Mon Sep 17 00:00:00 2001 From: Masahiko Shin Date: Tue, 4 May 2021 19:30:37 +0900 Subject: [PATCH 12/17] Add a tip to omit writing branch names when push --- README.md | 6 ++++++ tips.json | 3 +++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 26dac9b..2e6f300 100644 --- a/README.md +++ b/README.md @@ -170,6 +170,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [List all git aliases](#list-all-git-aliases) * [Show git status short](#show-git-status-short) * [Checkout a commit prior to a day ago](#checkout-a-commit-prior-to-a-day-ago) +* [Push the current branch to the same name on the remote repository](#push-the-current-branch-to-the-same-name-on-the-remote-repository) * [Push a new local branch to remote repository and track](#push-a-new-local-branch-to-remote-repository-and-track) * [Change a branch base](#change-a-branch-base) * [Use SSH instead of HTTPs for remotes](#use-ssh-instead-of-https-for-remotes) @@ -1213,6 +1214,11 @@ git status --short --branch git checkout master@{yesterday} ``` +## Push the current branch to the same name on the remote repository +```sh +git push origin HEAD +``` + ## Push a new local branch to remote repository and track ```sh git push -u origin diff --git a/tips.json b/tips.json index f823e40..992d116 100644 --- a/tips.json +++ b/tips.json @@ -508,6 +508,9 @@ "title": "Checkout a commit prior to a day ago", "tip": "git checkout master@{yesterday}" }, { + "title": "Push the current branch to the same name on the remote repository", + "tip": "git push origin HEAD" + }, { "title": "Push a new local branch to remote repository and track", "tip": "git push -u origin " }, { From dc7a62b67d247eefd94a4f8abf5e7c95c5efc807 Mon Sep 17 00:00:00 2001 From: Itai Klapholtz Date: Tue, 4 May 2021 18:34:18 +0300 Subject: [PATCH 13/17] Add create local tag tip --- README.md | 6 ++++++ tips.json | 3 +++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 26dac9b..b57c11a 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Track upstream branch](#track-upstream-branch) * [Delete local branch](#delete-local-branch) * [Delete remote branch](#delete-remote-branch) +* [Create local tag](#create-local-tag) * [Delete local tag](#delete-local-tag) * [Delete remote tag](#delete-remote-tag) * [Undo local changes with the last content in head](#undo-local-changes-with-the-last-content-in-head) @@ -316,6 +317,11 @@ git push origin : git branch -dr ``` +## Create local tag +```sh +git tag +``` + ## Delete local tag ```sh git tag -d diff --git a/tips.json b/tips.json index f823e40..217c960 100644 --- a/tips.json +++ b/tips.json @@ -65,6 +65,9 @@ "title": "Delete remote branch", "tip": "git push origin --delete ", "alternatives": ["git push origin :", "git branch -dr "] + }, { + "title": "Create local tag", + "tip": "git tag " }, { "title": "Delete local tag", "tip": "git tag -d " From 1c37e6b3eba09f3839fef75e31ba9170a096470f Mon Sep 17 00:00:00 2001 From: Mohammad Javad Nikbakht <37978546+javadnikbakht@users.noreply.github.com> Date: Fri, 13 Aug 2021 02:48:19 +0430 Subject: [PATCH 14/17] A Persian version of README file link Added --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71e3718..23f936d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## git-tips > Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md) -[English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips) | [Русский](https://github.com/Imangazaliev/git-tips) | [한국어](https://github.com/mingrammer/git-tips) | [Tiếng Việt](https://github.com/hprobotic/git-tips) | [日本語](https://github.com/isotai/git-tips) | [नेपाली](https://github.com/amarduwal/git-tips) | [Polski](https://github.com/mbiesiad/tips) +[English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips) | [Русский](https://github.com/Imangazaliev/git-tips) | [한국어](https://github.com/mingrammer/git-tips) | [Tiếng Việt](https://github.com/hprobotic/git-tips) | [日本語](https://github.com/isotai/git-tips) | [नेपाली](https://github.com/amarduwal/git-tips) | [Polski](https://github.com/mbiesiad/tips) | [فارسی](https://github.com/javadnikbakht/git-tips) ### __Tools:__ From a8f70a05dc8bc5870b3a92f7e2f35c5c79b52cbc Mon Sep 17 00:00:00 2001 From: Arnab Nandy Date: Thu, 6 Apr 2023 10:41:48 +0530 Subject: [PATCH 15/17] Fix:git checkout -- is incorrect #177 --- README.md | 2 +- tips.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 23f936d..757ef31 100644 --- a/README.md +++ b/README.md @@ -334,7 +334,7 @@ git tag -d git push origin :refs/tags/ ``` -## Undo local changes with the last content in head +## Undo local changes with the content in index(staging) ```sh git checkout -- ``` diff --git a/tips.json b/tips.json index 5c38a63..d53d1ae 100644 --- a/tips.json +++ b/tips.json @@ -75,7 +75,7 @@ "title": "Delete remote tag", "tip": "git push origin :refs/tags/" }, { - "title": "Undo local changes with the last content in head", + "title": "Undo local changes with the content in index(staging)", "tip": "git checkout -- " }, { "title": "Revert: Undo a commit by creating a new commit", From a67bf7c06eb76de096a9cbbffac9cb13e851f26b Mon Sep 17 00:00:00 2001 From: Arnab Nandy Date: Thu, 6 Apr 2023 10:56:32 +0530 Subject: [PATCH 16/17] adding the package files --- package-lock.json | 365 +--------------------------------------------- package.json | 2 +- 2 files changed, 5 insertions(+), 362 deletions(-) diff --git a/package-lock.json b/package-lock.json index 92e247e..ec93f7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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": { diff --git a/package.json b/package.json index 6d1b215..75efa09 100644 --- a/package.json +++ b/package.json @@ -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" } } From 07662dbac1348b9f6ee9c1d28f03e8bcb930db4a Mon Sep 17 00:00:00 2001 From: Bob Conan Date: Wed, 23 Oct 2024 15:11:22 -0500 Subject: [PATCH 17/17] Update tips.json, fix a typo --- tips.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tips.json b/tips.json index d53d1ae..7cf20b2 100644 --- a/tips.json +++ b/tips.json @@ -132,7 +132,7 @@ "title": "Git Aliases", "tip": "git config --global alias. \ngit config --global alias.st status" }, { - "title": "Saving current state of tracked files without commiting", + "title": "Saving current state of tracked files without committing", "tip": "git stash", "alternatives": ["git stash push"] }, {