From 5b8b0de1e78d69e8bf130deb2dd6836c0769f57e Mon Sep 17 00:00:00 2001 From: David Cottrell Date: Mon, 23 Oct 2023 11:43:30 +0100 Subject: [PATCH] Fix. --- .vscode/settings.json | 5 ++++- git_checkout_master_pull_all_submodules.sh | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 4d4e9a5a..6d753993 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,5 +11,8 @@ "**/data": true, "**/.ipynd_checkpoints/": true, "**/*.pyc": true - } + }, + "python.analysis.extraPaths": [ + "./my-gym/my/gym/usr/cottrell/equinox_utils" + ] } diff --git a/git_checkout_master_pull_all_submodules.sh b/git_checkout_master_pull_all_submodules.sh index e0cf4757..ead4da07 100755 --- a/git_checkout_master_pull_all_submodules.sh +++ b/git_checkout_master_pull_all_submodules.sh @@ -1,3 +1,6 @@ #!/bin/bash -e git pull # you forget this +# ugh +# master=$(git rev-parse --verify master 2>/dev/null 1>&2 && echo master || echo main) +# git submodule foreach --recursive 'git checkout master; git pull origin master:master; :' git submodule foreach --recursive 'git checkout master; git pull origin master:master; :'