several updates

This commit is contained in:
Felix Van der Jeugt 2024-08-02 11:37:09 +02:00
parent dac9f903c9
commit 4bc4e5b8ad
11 changed files with 91 additions and 161 deletions

View file

@ -7,7 +7,7 @@
[merge]
conflictstyle = diff3
[push]
default = simple
default = current
followTags = true
[gpg]
program = gpg
@ -18,11 +18,18 @@
[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 @{upstream}
ff = merge --ff-only
jn = merge --no-ff --log --edit
s = status -vv
ce = commit -m '' --allow-empty-message
ap = add -p
claim = blame -M -C -C -C
nuke = !git rm --cached -r . && git reset --hard
[rebase]
autoSquash = true
[rerere]
enabled = true
[core]
hooksPath = /home/ninewise/.config/git/hooks
[init]
defaultBranch = development