mirror of
https://tildegit.org/ben/dotfiles.git
synced 2025-03-14 10:20:43 +00:00
git options
This commit is contained in:
parent
84c3343b0f
commit
e52edc8402
@ -47,7 +47,7 @@
|
||||
upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}
|
||||
|
||||
[rerere]
|
||||
enabled = true
|
||||
enabled = true
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
conflictstyle = diff3
|
||||
@ -66,3 +66,9 @@
|
||||
|
||||
[init]
|
||||
defaultBranch = main
|
||||
[column]
|
||||
ui = auto
|
||||
[branch]
|
||||
sort = -committerdate
|
||||
[tag]
|
||||
sort = version:refname
|
||||
|
Loading…
x
Reference in New Issue
Block a user