Skip to content

Commit f5c9783

Browse files
committed
Merge branch 'release/0.2.4'
2 parents f3c0d30 + 742a423 commit f5c9783

File tree

7 files changed

+1126
-1032
lines changed

7 files changed

+1126
-1032
lines changed

.release-it.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"requireCleanWorkingDir": true
77
},
88
"npm": {
9-
"publish": false,
9+
"publish": true,
1010
"skipChecks": false
1111
},
1212
"github": {
@@ -22,7 +22,6 @@
2222
},
2323
"hooks": {
2424
"before:init": ["npm run lint:all", "npm run test"],
25-
"after:bump": "npm run build",
26-
"after:release": "npm publish"
25+
"after:bump": "npm run build"
2726
}
2827
}

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## [0.2.4](https://github.com/VChet/git-merged-branches/compare/0.2.3...0.2.4) (2025-07-02)
4+
5+
### Features
6+
7+
* **output:** display number of merged branches ([c425a94](https://github.com/VChet/git-merged-branches/commit/c425a9403494fdeb8be31e8423cd7f394d819050))
8+
9+
### Reverts
10+
11+
* Revert "ci(release-it): publish package in the end" ([d252e72](https://github.com/VChet/git-merged-branches/commit/d252e721168b538939c2ef4d36bfcb5b713bca77))
12+
313
## [0.2.3](https://github.com/VChet/git-merged-branches/compare/0.2.2...0.2.3) (2025-05-30)
414

515
### Features

README.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# git-merged-branches
22

3-
[![npm version](https://img.shields.io/npm/v/git-merged-branches)](https://www.npmjs.com/package/git-merged-branches)
4-
[![build](https://github.com/VChet/git-merged-branches/actions/workflows/build.yml/badge.svg)](https://github.com/VChet/git-merged-branches/actions/workflows/build.yml)
5-
[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/VChet/git-merged-branches)
3+
[![npm version][npm-version-src]][npm-version-href]
4+
[![npm downloads][npm-downloads-src]][npm-downloads-href]
5+
[![build][build-src]][build-href]
6+
[![ask DeepWiki][deep-wiki-src]][deep-wiki-href]
67

78
**git-merged-branches is a command-line utility to view branches merged into a selected base branch (e.g., master or main).**
89

@@ -32,7 +33,7 @@ Example output:
3233

3334
```bash
3435
$ git-merged-branches
35-
Branches merged into 'master':
36+
3 branches merged into 'master':
3637
bugfix/fix-crash-on-start
3738
feature/add-new-feature
3839
hotfix/urgent-fix
@@ -58,7 +59,7 @@ With this setup, `git-merged-branches` will generate links for branches with suc
5859

5960
```bash
6061
$ git-merged-branches
61-
Branches merged into 'master':
62+
4 branches merged into 'master':
6263
fix/EXTERNAL-391
6364
fix/TOKEN-123_some-fix <https://your-jira-instance.net/browse/TOKEN-123>
6465
hotfix
@@ -107,3 +108,13 @@ Now you can run `git-merged-branches` on your local machine.
107108
If you have any ideas, bug reports, or feature requests,
108109
feel free to [contribute](https://github.com/VChet/git-merged-branches/pulls)
109110
or report [issues](https://github.com/VChet/git-merged-branches/issues).
111+
112+
<!-- Badges -->
113+
[npm-version-src]: https://img.shields.io/npm/v/git-merged-branches
114+
[npm-version-href]: https://npmjs.com/package/git-merged-branches
115+
[npm-downloads-src]: https://img.shields.io/npm/dm/git-merged-branches
116+
[npm-downloads-href]: https://npmjs.com/package/git-merged-branches
117+
[build-src]: https://github.com/VChet/git-merged-branches/actions/workflows/build.yml/badge.svg
118+
[build-href]: https://github.com/VChet/git-merged-branches/actions/workflows/build.yml
119+
[deep-wiki-src]: https://deepwiki.com/badge.svg
120+
[deep-wiki-href]: https://deepwiki.com/VChet/git-merged-branches

package.json

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
{
22
"name": "git-merged-branches",
33
"description": "CLI tool to list all Git branches merged into a base branch with issue link formatting",
4+
"keywords": [
5+
"git",
6+
"cli",
7+
"branch",
8+
"issue-tracker"
9+
],
410
"type": "module",
5-
"version": "0.2.3",
11+
"version": "0.2.4",
612
"license": "MIT",
713
"author": {
814
"name": "VChet",
@@ -38,13 +44,33 @@
3844
},
3945
"devDependencies": {
4046
"@release-it/conventional-changelog": "^10.0.1",
41-
"@types/node": "^22.15.24",
47+
"@types/node": "^24.0.10",
4248
"dotenv-cli": "^8.0.0",
4349
"esbuild": "^0.25.5",
44-
"eslint": "^9.27.0",
50+
"eslint": "^9.30.1",
4551
"neostandard": "^0.12.1",
46-
"release-it": "^19.0.2",
52+
"release-it": "^19.0.3",
4753
"typescript": "^5.8.3",
48-
"vitest": "^3.1.4"
54+
"vitest": "^3.2.4"
55+
},
56+
"pnpm": {
57+
"overrides": {
58+
"array-includes": "npm:@nolyfill/array-includes@^1",
59+
"array.prototype.findlast": "npm:@nolyfill/array.prototype.findlast@^1",
60+
"array.prototype.flat": "npm:@nolyfill/array.prototype.flat@^1",
61+
"array.prototype.flatmap": "npm:@nolyfill/array.prototype.flatmap@^1",
62+
"array.prototype.tosorted": "npm:@nolyfill/array.prototype.tosorted@^1",
63+
"es-iterator-helpers": "npm:@nolyfill/es-iterator-helpers@^1",
64+
"hasown": "npm:@nolyfill/hasown@^1",
65+
"is-core-module": "npm:@nolyfill/is-core-module@^1",
66+
"object.assign": "npm:@nolyfill/object.assign@^1",
67+
"object.entries": "npm:@nolyfill/object.entries@^1",
68+
"object.fromentries": "npm:@nolyfill/object.fromentries@^1",
69+
"object.values": "npm:@nolyfill/object.values@^1",
70+
"safe-buffer": "npm:@nolyfill/safe-buffer@^1",
71+
"safer-buffer": "npm:@nolyfill/safer-buffer@^1",
72+
"string.prototype.matchall": "npm:@nolyfill/string.prototype.matchall@^1",
73+
"typedarray": "npm:@nolyfill/typedarray@^1"
74+
}
4975
}
5076
}

0 commit comments

Comments
 (0)