ninewise/configuration
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better join (PR merge) alias

Browse Source
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
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gitconfig
View File

@ -8,6 +8,7 @@
conflictstyle = diff3 conflictstyle = diff3
[push] [push]
default = simple default = simple
followTags = true
[core] [core]
excludesfile = ~/.config/gitignore excludesfile = ~/.config/gitignore
[gpg] [gpg]
@ -17,6 +18,7 @@
[alias] [alias]
pf = push --force-with-lease 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 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 ff = merge --ff-only
co = checkout co = checkout
jn = merge --no-ff jn = merge --no-ff --log --edit