diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2015-10-16 10:29:25 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2015-10-16 10:29:25 -0400 |
| commit | 6d6affd645bdeba10d9166dddcab6c8b427efc6b (patch) | |
| tree | 3d062c2788ed582ba24e6d5593c9bde79f3eed2c | |
| parent | 431af7d6836fcb72f99d2fce6e8677e3ff48a648 (diff) | |
| parent | c5d536e6d279217123fe710b5fcceaa3beb5220f (diff) | |
Merge branches 'master' and 'master' of tesuji.6.orbekk.com:/storage/projects/dotfiles
| -rwxr-xr-x | bin/kj-setup.sh | 2 | ||||
| m--------- | zgen | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/bin/kj-setup.sh b/bin/kj-setup.sh index 5058bb5..d020f11 100755 --- a/bin/kj-setup.sh +++ b/bin/kj-setup.sh @@ -22,7 +22,7 @@ done cd ~/dotfiles git submodule update --init --recursive -git submodule foreach pull +git submodule foreach git pull origin master cd # Creates a symlink with target $1 at location $2. diff --git a/zgen b/zgen -Subproject 4acba623a0906e2d4723e176ce137dfb2021ea3 +Subproject 6ac1bf1b201f52d9f5493988f8b3f26b7c0299e |