From 16c57bb791a1fc76b8b00894e29c050681809402 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 6 May 2024 09:53:43 +0200 Subject: ... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- git/.gitignore | 2 +- git/Makefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'git') diff --git a/git/.gitignore b/git/.gitignore index 7fada2a..1f89d9f 100644 --- a/git/.gitignore +++ b/git/.gitignore @@ -1 +1 @@ -/.config +.config diff --git a/git/Makefile b/git/Makefile index b07a06d..1794675 100644 --- a/git/Makefile +++ b/git/Makefile @@ -6,7 +6,10 @@ install: test ! -e ~/.config/git/config || test -f ~/.config/git/config cp -- config .config if test -f ../.secrets/git/config; then\ - cat ../.secrets/git/config >> .config;\ + cat -- ../.secrets/git/config >> .config;\ + fi + if test -f ../.work/pkgs/git/config; then\ + cat -- ../.work/pkgs/git/config-include >> .config;\ fi ln -sf -- ~/.dotfiles/git/.config ~/.config/git/config mkdir -p -- ~/.config/bash/aliases.d -- cgit v1.2.3-70-g09d2