Commit Graph

6 Commits

Author SHA1 Message Date
Alicia Sykes
7fb8fc834e Merge branch 'master' of github.com:Lissy93/dotfiles
# Conflicts:
#	installs/arch.sh
2022-10-11 17:21:26 +01:00
Alicia Sykes
38b5f0f415 Fix .gitconfig conflict 2022-09-24 15:44:39 +01:00
Alicia Sykes
14af202030 Adds link to .gitconfigglobal 2022-09-18 17:11:35 +01:00
Alicia Sykes
1ab193b238 Updates git configuration 2022-08-12 12:22:26 +01:00
Alicia Sykes
b924223056 Sets default merge strategy in .gitconfig 2022-08-09 16:28:51 +01:00
Alicia Sykes
577a69ade9 Moves loose files to own directory, configs 2022-08-07 17:00:06 +01:00