aboutsummaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2024-05-06 09:53:43 +0200
committerMattias Andrée <maandree@kth.se>2024-05-06 09:53:43 +0200
commit16c57bb791a1fc76b8b00894e29c050681809402 (patch)
tree5627d8bf0ed3767956caf89d28eabb6155ff8879 /git
parentm (diff)
downloaddotfiles-16c57bb791a1fc76b8b00894e29c050681809402.tar.gz
dotfiles-16c57bb791a1fc76b8b00894e29c050681809402.tar.bz2
dotfiles-16c57bb791a1fc76b8b00894e29c050681809402.tar.xz
...
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
-rw-r--r--git/.gitignore2
-rw-r--r--git/Makefile5
2 files changed, 5 insertions, 2 deletions
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