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

⚙️ config(gitconfig): added merge, deleted before by accident

Browse source
This commit is contained in:
Sergio Laín 2023-11-20 14:06:58 +01:00
parent d966f6d9bf
commit 39f14d5da0
No known key found for this signature in database
GPG key ID: 14C9B8080681777B
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitconfig
View file

@ -100,7 +100,8 @@
#############
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