kayprish/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

⚙️ config(git): added merge options to commitizen and gitconfig alias

Browse source
This commit is contained in:
Sergio Laín 2023-11-20 12:19:43 +01:00
parent 717952234c
commit c2324b8cb2
No known key found for this signature in database
GPG key ID: 14C9B8080681777B
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.czrc
View file

@ -54,7 +54,8 @@
{ {
"value": "📁 files", "value": "📁 files",
"name": "📁 files: Changes in files or directories" "name": "📁 files: Changes in files or directories"
} },
{ "value": "🔀 merge", "name": "🔀 merge: Merge branch or pull request" }
], ],
"allowCustomScopes": true, "allowCustomScopes": true,
"allowBreakingChanges": ["✨ feat", "🐛 fix"] "allowBreakingChanges": ["✨ feat", "🐛 fix"]

2
.gitconfig
View file

@ -101,7 +101,7 @@
ls = ls-files ls = ls-files
lsf = !git ls-files | grep -i 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 ma = merge --abort
mc = merge --continue mc = merge --continue
ms = merge --skip ms = merge --skip