better join (PR merge) alias

This commit is contained in:
Felix Van der Jeugt 2018-11-22 13:39:45 +01:00
parent 8ddc79cb22
commit 9242f19b25
No known key found for this signature in database
GPG Key ID: 58B209295023754D

View File

@ -8,6 +8,7 @@
conflictstyle = diff3
[push]
default = simple
followTags = true
[core]
excludesfile = ~/.config/gitignore
[gpg]
@ -17,6 +18,7 @@
[alias]
pf = push --force-with-lease
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
ff = merge --ff-only
co = checkout
jn = merge --no-ff
ff = merge --ff-only
co = checkout
jn = merge --no-ff --log --edit