andreijiroh-dev/dotfiles
1
1
Fork 0
mirror of https://mau.dev/andreijiroh-dev/dotfiles.git synced 2025-05-16 18:43:07 +00:00
Code Issues Releases Packages Activity Actions

chore(global): fix some merge conflicts while syncing from nest

Browse source 
Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>
This commit is contained in:
Andrei Jiroh Halili 2024-10-08 13:33:59 +00:00
parent 5c84218091
commit f0e3f5c93b
3 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitconfig
View file

@ -69,11 +69,13 @@
signoff-commit = commit --signoff
signoff = signoff-commit
remotes = remote -v
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[core]
# editor = flatpak run re.sonny.Commit
@ -94,6 +96,8 @@
path = ~/.config/git/recaptime-dev.include.gitconfig
[includeIf "gitdir/i:/var/git/recaptime-dev/"]
path = ~/.config/git/recaptime-dev.include.gitconfig
[includeIf "gitdir/i:~/git/recaptime-dev/"]
path = ~/.config/git/recaptime-dev.include.gitconfig
[includeIf "gitdir/i:/workspaces/lorebooks.wiki/"]
path = ~/.config/git/recaptime-dev.include.gitconfig
[includeIf "gitdir/i:/workspaces/lorebooks-wiki/"]