⚙️ config(git): added merge options to commitizen and gitconfig alias
This commit is contained in:
parent
717952234c
commit
c2324b8cb2
2 changed files with 3 additions and 2 deletions
3
.czrc
3
.czrc
|
@ -54,7 +54,8 @@
|
|||
{
|
||||
"value": "📁 files",
|
||||
"name": "📁 files: Changes in files or directories"
|
||||
}
|
||||
},
|
||||
{ "value": "🔀 merge", "name": "🔀 merge: Merge branch or pull request" }
|
||||
],
|
||||
"allowCustomScopes": true,
|
||||
"allowBreakingChanges": ["✨ feat", "🐛 fix"]
|
||||
|
|
|
@ -101,7 +101,7 @@
|
|||
ls = ls-files
|
||||
lsf = !git ls-files | grep -i
|
||||
#############
|
||||
m = merge
|
||||
mm = merge --no-ff -m "🔀 merge: Merge branch '$(git symbolic-ref --short HEAD)' into '$(git branch --show-current)'"
|
||||
ma = merge --abort
|
||||
mc = merge --continue
|
||||
ms = merge --skip
|
||||
|
|
Loading…
Add table
Reference in a new issue