odrling/dotfiles
1
1
Fork 1
Code Issues Pull requests Packages Projects Releases Wiki Activity

[git] default to rebasing on git pull

Browse source
This commit is contained in:
odrling 2024-03-10 12:35:45 +01:00
parent 69631e2c6e
commit 36fb177942
No known key found for this signature in database
GPG key ID: E24CA7508C27AF5B
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.config/git/config
View file

@ -27,7 +27,8 @@
logallrefupdates = true
hooksPath = "~/.config/git/hooks"
[pull]
rebase = false
ff = "only"
rebase = "merges"
[alias]
l = "log --date=short --graph --pretty=format:\"%C(green)%h%Creset%C(cyan)%C(bold)%d%Creset %s %C(magenta)%cd%Creset %C(blue)%an%Creset\""
ll = log --stat