mirror of
https://github.com/ForeverPyrite/dotfiles.git
synced 2025-12-10 01:08:06 +00:00
Basic gitconfig
Still need a proper gitmerge tool I think.
This commit is contained in:
19
git/.gitconfig
Normal file
19
git/.gitconfig
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
[user]
|
||||||
|
name = foreverpyrite
|
||||||
|
email = git@foreverpyrite.com
|
||||||
|
|
||||||
|
[init]
|
||||||
|
defaultBranch = main
|
||||||
|
|
||||||
|
[core]
|
||||||
|
pager = delta
|
||||||
|
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
|
[delta]
|
||||||
|
navigate = true # use n and N to move between diff sections
|
||||||
|
dark = true # or light = true, or omit for auto-detection
|
||||||
|
|
||||||
|
[merge]
|
||||||
|
conflictStyle = zdiff3
|
||||||
Reference in New Issue
Block a user