From de8ad4ac08a88d73a95adbe91d2e8eb31630462a Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Wed, 21 Dec 2022 17:53:47 -0800 Subject: [PATCH] Explicitly include user gitconfig This bypasses an annoying issue when using both ~/.gitconfig and ~/.user.gitconfig, which is that there is no guarantee of the order these configs are loaded. This means that configs loaded in ~/.user.gitconfig (which in this case is intended to override ~/.gitconfig) may not actually override those found in ~/.gitconfig. By using `include.path`, they are loaded a second time, but it guarantees they are loaded after all the configs in ~/.gitconfig, ensuring they are used in cases where the key is present in both files. --- src/.gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/.gitconfig b/src/.gitconfig index 0cb77f5..ae822ee 100644 --- a/src/.gitconfig +++ b/src/.gitconfig @@ -81,3 +81,6 @@ [user] name = Jordan Atwood email = nightfirecat@nightfirec.at + +[include] + path = ~/.user.gitconfig