Skip to content

Commit 87114a3

Browse files
authored
Merge pull request #3 from justcoded/develop
Renamed config/gitflow commands
2 parents 25269f9 + 20fc859 commit 87114a3

File tree

6 files changed

+53
-3
lines changed

6 files changed

+53
-3
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
---
1010
<!--- END HEADER -->
1111

12+
## [1.1.0](https://github.com/justcoded/git-extras/compare/v1.0.0...v1.1.0) (2022-05-13)
13+
### Features
14+
15+
* Renamed config/gitflow commands prefix
16+
17+
18+
---
19+
1220
## [1.0.0]() (2022-05-09)
1321
### Features
1422

Makefile

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,32 @@
1-
.PHONY: default install
1+
.PHONY: default install uninstall chl chl-first
22

33
default:
44
@echo 'Git extras installation helper from JustCoded'
55

66
install:
77
sudo cp -f ./bin/* /usr/local/bin/
88
sudo chmod +x /usr/local/bin/git-*
9+
10+
uninstall:
11+
sudo rm /usr/local/bin/git-*
12+
13+
##
14+
# CHANGELOG vars and targets
15+
##
16+
CONV_CHL_IMAGE := justcoded/php-conventional-changelog:latest
17+
CONV_CHL_DR := docker run -it --rm --volume "$$PWD":/codebase ${CONV_CHL_IMAGE} bash
18+
CONV_CHL_CMD := conventional-changelog --config changelog-config.php
19+
20+
##
21+
# @command chl Generate changelog based on conventional commits
22+
##
23+
chl:
24+
${CONV_CHL_DR} \
25+
-c "${CONV_CHL_CMD}"
26+
27+
##
28+
# @command chl-first Generate changelog based on conventional commits, first version
29+
##
30+
chl-first:
31+
${CONV_CHL_DR} \
32+
-c "${CONV_CHL_CMD} --first-release"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ make install
1919
| Command | Description |
2020
|-------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------|
2121
| `git browse` | Opens remote repository URL in browser. Taken from [git-extras](https://github.com/tj/git-extras). |
22-
| `git jc-config` | Configures repository with default global filemode (or 'false' by default) and push strategy. |
23-
| `git jc-gitflow` | Creates if not exists `develop`/`release` branches or sync them. |
22+
| `git set-config` | Configures repository with default global filemode (or 'false' by default) and push strategy. |
23+
| `git set-gitflow` | Creates if not exists `develop`/`release` branches or sync them. |
2424
| `git jc-feature <shortDescription>` | Defines git branching flow ("gitflow" or "feature branch") and creates Feature branch from the right branch (develop or main/master) |
2525
| `git jc-hotfix <shortDescription>` | Creates Hotfix branch from `main`/`master` branch. |
2626
| `git lk-feature <shortDescription>` | Creates Feature branch from `release`. |
File renamed without changes.
File renamed without changes.

changelog-config.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
/**
3+
* @see: https://github.com/marcocesarato/php-conventional-changelog/blob/main/docs/config.md
4+
*/
5+
6+
return [
7+
'path' => 'CHANGELOG.md',
8+
'headerTitle' => 'Changelog',
9+
'headerDescription' => 'All notable changes to this project will be documented in this file.
10+
11+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
12+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
13+
14+
---',
15+
'ignoreTypes' => ['build', 'chore', 'ci', 'docs', 'perf', 'refactor', 'revert', 'style', 'test', 'bug'],
16+
17+
'hiddenHash' => true,
18+
];

0 commit comments

Comments
 (0)