insects/home
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
liv 2023-10-02 09:54:16 +02:00
parent 9eca2a7fad
commit eb1d9bfedb
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dot_gitconfig
View file

@ -4,9 +4,13 @@
signingkey = 0x6F33B647A7AC80CE
[core]
editor = vim
<<<<<<< Updated upstream
autocrlf = input
=======
>>>>>>> Stashed changes
[push]
default = simple
autoSetupRemote = true
[pull]
rebase = true
[rebase]