js0ny/dotfiles
1
0
Fork 0
mirror of https://github.com/js0ny/dotfiles.git synced 2025-12-21 08:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged from upstream

Browse source
This commit is contained in:
js0ny 2025-01-27 00:33:07 +00:00
parent 506f4fd54f
commit 23eba5432c
1 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/gitconfig.example
View file

@ -10,7 +10,6 @@
[user] # Modify the name and email [user] # Modify the name and email
name = whoami name = whoami
email = whoami@example.com email = whoami@example.com
<<<<<<< HEAD
[alias] [alias]
cl = clone cl = clone
clnh = clone --depth 1 clnh = clone --depth 1
@ -26,20 +25,18 @@
excludesfile = $XDG_CONFIG_HOME/git/ignore excludesfile = $XDG_CONFIG_HOME/git/ignore
quotePath = false # zh-CN: 解决中文路径问题 quotePath = false # zh-CN: 解决中文路径问题
eol = lf eol = lf
=======
[include] [include]
path = ~/.config/git/catppuccin-delta.gitconfig path = ~/.config/git/catppuccin-delta.gitconfig
[core] [core]
editor = nvim editor = nvim
pager = delta pager = delta
autocrlf = input # Force End of Line in different platforms autocrlf = input # Force End of Line in different platforms
>>>>>>> github/master
[interactive] [interactive]
diffFilter = delta --color-only diffFilter = delta --color-only
[delta] [delta]
navigate = true navigate = true
dark = true dark = true
<<<<<<< HEAD features = catppuccin-mocha
[diff] [diff]
tool = nvimdiff tool = nvimdiff
[difftool] [difftool]
@ -58,24 +55,13 @@
ff = only ff = only
[init] [init]
defaultBranch = master defaultBranch = master
=======
features = catppuccin-mocha
>>>>>>> github/master
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
<<<<<<< HEAD
# Force ssh # Force ssh
# [url "git@github.com:"] # [url "git@github.com:"]
# insteadOf = https://github.com/ # insteadOf = https://github.com/
[url "git@codeberg.org:"] [url "git@codeberg.org:"]
insteadOf = https://codeberg.org/ insteadOf = https://codeberg.org/
=======
[init]
defaultBranch = master
# [url "git@github.com:"] # Force ssh
# insteadOf = https://github.com/
>>>>>>> github/master