dot

packages and services management
Log | Files | Refs | README

commit 7bf19ebf3a14dc6dae7f42e4295f271f8e6ba894
parent e50f95eb177ac34e739bf33c011f98021bdd83cc
Author: Josuah Demangeon <mail@josuah.net>
Date:   Mon,  9 Apr 2018 10:42:40 +0200

Merge branch 'master' of /home/josuah/etc/

Diffstat:
MMakefile | 4++++
1 file changed, 4 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile @@ -29,4 +29,8 @@ config: .PHONY: git git: mkdir -p ${HOME}/var/git +<<<<<<< HEAD grep -v ^# git/repos | (cd ${HOME}/var/git && xargs -n 1 git clone --bare) +======= + (cd ${HOME}/var/git && xargs -n 1 git clone --bare) <git/repos +>>>>>>> 98903ee6ce6d16d92e67e3289c322a5c2e41edb4