diff options
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 |