From 76732df0777c5b3d75b635ef052183e258470ce5 Mon Sep 17 00:00:00 2001 From: Milad Nekofar Date: Mon, 9 Nov 2020 18:47:53 +0330 Subject: [PATCH 1/3] chore: update pre-commit and standard version configs Signed-off-by: Milad Nekofar --- .pre-commit-config.yaml | 11 ++++++----- .versionrc.json | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6619efa..3cbb244 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,18 +2,19 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.4.0 + rev: v3.3.0 hooks: - - id: no-commit-to-branch - args: [-b master] - id: trailing-whitespace - id: end-of-file-fixer - id: check-yaml - - id: check-json - id: check-added-large-files + - id: no-commit-to-branch + args: [-b master] + - id: check-xml + - id: check-json - id: check-merge-conflict - repo: https://github.com/jorisroovers/gitlint - rev: v0.13.1 + rev: v0.14.0 hooks: - id: gitlint stages: [commit-msg] diff --git a/.versionrc.json b/.versionrc.json index ddc3bf9..ce50f05 100644 --- a/.versionrc.json +++ b/.versionrc.json @@ -1,6 +1,10 @@ { + "header": "# Changelog", "skip": { "commit": true, "tag": true + }, + "scripts": { + "postchangelog": "sed -i '' 's/\\*\\*\\(.*\\)\\*\\*//g' CHANGELOG.md" } } From dc2e87548ac46418676db43b308e1e9c593c6459 Mon Sep 17 00:00:00 2001 From: Milad Nekofar Date: Mon, 9 Nov 2020 18:49:16 +0330 Subject: [PATCH 2/3] feat: add some useful aliases Signed-off-by: Milad Nekofar --- zsh-git-flow-avh.zsh | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/zsh-git-flow-avh.zsh b/zsh-git-flow-avh.zsh index 50f9364..8fd35d5 100644 --- a/zsh-git-flow-avh.zsh +++ b/zsh-git-flow-avh.zsh @@ -4,26 +4,35 @@ alias gfl='git flow' alias gfli='git flow init' -alias gflc='git flow config' alias gfll='git flow log' alias gflv='git flow version' +alias gflc='git flow config' +alias gflcs='git flow config set' +alias gflcb='git flow config base' + alias gflf='git flow feature' alias gflfl='git flow feature list' alias gflfs='git flow feature start' alias gflff='git flow feature finish --no-ff' +alias gflff!='git flow feature finish --no-ff --force' alias gflfp='git flow feature publish' alias gflft='git flow feature track' alias gflfd='git flow feature diff' alias gflfr='git flow feature rebase' alias gflfc='git flow feature checkout' +alias gflfc!='git flow feature checkout --force' alias gflfm='git flow feature pull' +alias gflfm!='git flow feature pull --force' alias gflfx='git flow feature delete' +alias gflfx!='git flow feature delete --force' +alias gflfn='git flow feature rename' alias gflb='git flow bugfix' alias gflbl='git flow bugfix list' alias gflbs='git flow bugfix start' alias gflbf='git flow bugfix finish --no-ff' +alias gflbf!='git flow bugfix finish --no-ff --force' alias gflbp='git flow bugfix publish' alias gflbt='git flow bugfix track' alias gflbd='git flow bugfix diff' @@ -31,30 +40,29 @@ alias gflbr='git flow bugfix rebase' alias gflbc='git flow bugfix checkout' alias gflbm='git flow bugfix pull' alias gflbx='git flow bugfix delete' +alias gflbx!='git flow bugfix delete --force' +alias gflbn='git flow bugfix rename' alias gflr='git flow release' alias gflrl='git flow release list' alias gflrs='git flow release start' alias gflrf='git flow release finish' +alias gflrb='git flow release branch' alias gflrp='git flow release publish' alias gflrt='git flow release track' -alias gflrd='git flow release diff' -alias gflrr='git flow release rebase' -alias gflrc='git flow release checkout' -alias gflrm='git flow release pull' alias gflrx='git flow release delete' +alias gflrx!='git flow release delete --force' +alias gflrr='git flow release rebase' alias gflh='git flow hotfix' alias gflhl='git flow hotfix list' alias gflhs='git flow hotfix start' alias gflhf='git flow hotfix finish' alias gflhp='git flow hotfix publish' -alias gflht='git flow hotfix track' -alias gflhd='git flow hotfix diff' -alias gflhr='git flow hotfix rebase' -alias gflhc='git flow hotfix checkout' -alias gflhm='git flow hotfix pull' alias gflhx='git flow hotfix delete' +alias gflhx!='git flow hotfix delete --force' +alias gflhr='git flow hotfix rebase' +alias gflhn='git flow hotfix rename' alias gfls='git flow support' alias gflsl='git flow support list' From f2f1691318e3f95205b7024b7fd5111a85618648 Mon Sep 17 00:00:00 2001 From: Milad Nekofar Date: Mon, 9 Nov 2020 18:52:16 +0330 Subject: [PATCH 3/3] docs(changelog): update version to v1.1.0 Signed-off-by: Milad Nekofar --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d6f0e4..4f8bc0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [1.1.0](https://github.com/nekofar/zsh-git-flow-avh/compare/v1.0.1...v1.1.0) (2020-11-09) -All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### Features + +* add some useful aliases ([dc2e875](https://github.com/nekofar/zsh-git-flow-avh/commit/dc2e87548ac46418676db43b308e1e9c593c6459)) +# Changelog + +All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.