benharri/dotfiles
1
0
Fork 0
mirror of https://tildegit.org/ben/dotfiles.git synced 2025-08-10 05:02:03 +00:00
Code Issues Projects Releases Wiki Activity

git options

Browse Source
This commit is contained in:
Ben Harris 2024-02-29 17:34:37 -05:00
parent 84c3343b0f
commit e52edc8402
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git/.gitconfig
View File

@ -47,7 +47,7 @@
upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')} upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}
[rerere] [rerere]
enabled = true enabled = true
[merge] [merge]
tool = vimdiff tool = vimdiff
conflictstyle = diff3 conflictstyle = diff3
@ -66,3 +66,9 @@
[init] [init]
defaultBranch = main defaultBranch = main
[column]
ui = auto
[branch]
sort = -committerdate
[tag]
sort = version:refname