diff options
| author | Mattias Andrée <maandree@kth.se> | 2024-05-06 09:53:43 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2024-05-06 09:53:43 +0200 |
| commit | 16c57bb791a1fc76b8b00894e29c050681809402 (patch) | |
| tree | 5627d8bf0ed3767956caf89d28eabb6155ff8879 /git | |
| parent | m (diff) | |
| download | dotfiles-16c57bb791a1fc76b8b00894e29c050681809402.tar.gz dotfiles-16c57bb791a1fc76b8b00894e29c050681809402.tar.bz2 dotfiles-16c57bb791a1fc76b8b00894e29c050681809402.tar.xz | |
...
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'git')
| -rw-r--r-- | git/.gitignore | 2 | ||||
| -rw-r--r-- | git/Makefile | 5 |
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 |