The git.sh script manages git operations across webroot, submodules, and site repos.
+
+
Basic Commands
+
+./git.sh pull # Pull all repositories (webroot + submodules + site repos)
+./git.sh push # Push all repositories with changes (auto-pulls first)
+./git.sh push nopull # Push without auto-pull (use after git filter-repo or when history diverges)
+./git.sh push [repo] # Push specific repository
+./git.sh push nopr # Push without creating PRs on failure
+./git.sh push nopull nopr # Combine options: skip pull and skip PR creation
+
+
+
Options
+
+
nopr - Skip PR creation on push failures
+
nopull - Skip auto-pull before push (use when history has diverged, after git filter-repo, or when you need to force push)
+
+
+
When to use nopull
+
+
After using git filter-repo to clean git history (histories have diverged)
+
When you need to force push without pulling first
+
When you know the local history is correct and should overwrite remote
+
Warning: Only use when you understand the implications of not pulling first
+
+
+
## Using git.sh (Recommended)
Your Code CLI can write your PR comments if you run the "push" command below.
@@ -65,32 +123,4 @@ Or prompt "push" with your CLI to have a description of your changes included.
Note: Sometimes CLIs gets confused and treat the team folder as the webroot.
-IMPORTANT: If you're using Github Desktop to push, you'll still need to send the PR from within Github.com.
-
-
-## Using your CLI with ./git.sh push
-
-For the first usage, include extra guidance. Your push will also pull recent updates from others on Github.
-
- push using webroot/AGENTS.md with git.sh
-
-
-If you find "push" is asking for multiple approvals, your CLI isn't following its AGENTS.md instructions.
-When AGENTS.md is followed, "push" uses the git.sh file to first pull, then update the webroot, submodules and forks.
-
- push
-
-Additional deployment commands:
-
- push [folder name] # Deploy a specific submodule or fork
- push submodules # Deploy changes in all submodules
- push forks # Deploy the extra forks added
-
-"push" also sends a Pull Request (PR) unless you include "nopr"
-
-
-## Manual submodule refresh
-
-You can refresh all your local submodules by running:
-
- git submodule foreach 'git pull origin main || git pull origin master'
\ No newline at end of file
+IMPORTANT: If you're using Github Desktop to push, you'll still need to send the PR from within Github.com.
\ No newline at end of file
diff --git a/exiobase b/exiobase
index 87b932039..2a6e9b8d8 160000
--- a/exiobase
+++ b/exiobase
@@ -1 +1 @@
-Subproject commit 87b932039de50e157f14cf040095623d925a3078
+Subproject commit 2a6e9b8d8061bd8bf36464cff0af3fdba6d0d83b
diff --git a/io b/io
index fc8e77761..28fb41fc9 160000
--- a/io
+++ b/io
@@ -1 +1 @@
-Subproject commit fc8e77761d54a02e7d14bfff3b54418c8eb44f73
+Subproject commit 28fb41fc9a30937273cd95bb3d07405a58eafe5c
diff --git a/team b/team
index 2904629bf..7f32abbdd 160000
--- a/team
+++ b/team
@@ -1 +1 @@
-Subproject commit 2904629bf6c6787a09499a3d000c19813c10fee9
+Subproject commit 7f32abbddfce999d6a82c12a488b463117369158
From 1f3a4ae617a07270cd091edfd0a0d0fa41bb14df Mon Sep 17 00:00:00 2001
From: ModelEarth <48058099+ModelEarth@users.noreply.github.com>
Date: Sun, 15 Feb 2026 20:08:16 -0500
Subject: [PATCH 023/369] git.sh updates
---
community-forecasting | 2 +-
deploy.md | 38 +++++++++++++-------------------------
2 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/community-forecasting b/community-forecasting
index d6361562d..3dbba7ab8 160000
--- a/community-forecasting
+++ b/community-forecasting
@@ -1 +1 @@
-Subproject commit d6361562dbba3fa8b878841cc0c0720862a447a9
+Subproject commit 3dbba7ab89607faccb2c97dc940f209b0ee68f3c
diff --git a/deploy.md b/deploy.md
index cedfe1070..d2d034d4e 100644
--- a/deploy.md
+++ b/deploy.md
@@ -1,12 +1,13 @@
How to deploy changes
Update and make commits often. (At least hourly if you are editing code.)
-Append "nopr" or "No PR" if you are not yet ready to send a Pull Request.
+Append "nopr" if you are not yet ready to send a Pull Request.
-## Using your CLI with ./git.sh push
+## Using your Code CLI to push and pull
-For the first usage, include extra guidance. Your push will also pull recent updates from others on Github.
+For the first usage, include extra guidance.
+Your push will also pull recent updates from others on Github.
push using webroot/AGENTS.md with git.sh
@@ -34,7 +35,7 @@ You can refresh all your local submodules by running:
## Git Workflow with git.sh
-
The git.sh script manages git operations across webroot, submodules, and site repos.
+Rather than using the simple Code CLI commands above, the git.sh script can be callled directly to manage git operations across webroot, submodules, and site repos.
Basic Commands
@@ -61,13 +62,7 @@ You can refresh all your local submodules by running:
-## Using git.sh (Recommended)
-
-Your Code CLI can write your PR comments if you run the "push" command below.
-
-Or run your git.sh commands as follows in a separate terminal from your CLI.
-
-Start a secure virtual session in your local webroot and give the git.sh files permission.
+If needed, start a secure virtual session in your local webroot and give the git.sh file permission.
python3 -m venv env
@@ -77,22 +72,14 @@ Start a secure virtual session in your local webroot and give the git.sh files p
Run ./git.sh in your webroot. In the root git.sh is a pass-through to the team/git.sh file.
-You can watch your webroot's file status change in Github Desktop to confirm updates are deployed.
-
- ./git.sh push # Push all repositories with changes (auto-pulls first)
- ./git.sh pull # Pull all repositories (webroot + submodules + extra repos)
- ./git.sh push [name] # Push specific repository (webroot, submodule, or extra repo)
- ./git.sh pull [name] # Pull specific repository
-
You probably won't need these since cmds above resolve detached heads for submodules that differ from their parent repos.
./git.sh fix # Fix detached HEAD states
./git.sh remotes # Update remotes for current GitHub user
-"push" also sends a Pull Request (PR) unless you include "nopr"
+"push" also sends a Pull Request (PR) unless you include "nopr"
-### Wait to submit Pull Request:
-- Add `nopr` to skip PR creation: `./git.sh push nopr`
+ ./git.sh push nopr
-
-### Supported repositories:
-- **Webroot**: webroot
-- **Submodules**: Automatically detected from .gitmodules file
-- **Extra Repos**: Automatically detected from .siterepos file
-
-## Using Github Desktop (recommended)
-
-Use Github Desktop to choose a repo in the webroot using "File > Add Local Repository".
-
-Then submit a PR through the Github.com website.
-
-Or prompt "push" with your CLI to have a description of your changes included.
-
-Note: Sometimes CLIs gets confused and treat the team folder as the webroot.
-
-IMPORTANT: If you're using Github Desktop to push, you'll still need to send the PR from within Github.com.
\ No newline at end of file
diff --git a/index.html b/index.html
index 967d00f84..d8a795ba5 100644
--- a/index.html
+++ b/index.html
@@ -54,10 +54,12 @@
setupWebrootSetup('webrootSetup');
setupGitAccountFields('textInPage');
setupQuickstartInstructions('quickstartDiv');
+ createRustApiStatusPanel('combined-rust-api-container', false);
setupTradeFlowRepos('tradeFlowRepos');
setupGeminiResources();
setupBackendInfo('backendInfo');
- loadMarkdown("deploy.md", "deployDiv", "_parent", 1);
+ loadMarkdown("team/admin/github/deploy-cli.md", "deployCliDiv", "_parent", 1);
+ loadMarkdown("team/admin/github/deploy-git.md", "deployGitDiv", "_parent", 1);
setTimeout(() => { updateForkReposCommands(); }, 100);
}, 200);
@@ -101,6 +103,18 @@
readmeDiv.innerHTML = content;
}
});
+
+waitForElm('#showDeployGit').then(() => { // Toggle display of additional git.sh commands
+ const showDeployGitBtn = document.getElementById('showDeployGit');
+ const deployGitPanel = document.getElementById('deployGit');
+ if (!showDeployGitBtn || !deployGitPanel) return;
+
+ showDeployGitBtn.addEventListener('click', () => {
+ const isHidden = getComputedStyle(deployGitPanel).display === 'none';
+ deployGitPanel.style.display = isHidden ? 'block' : 'none';
+ showDeployGitBtn.textContent = isHidden ? 'Hide Deploy Options' : 'More Deploy Options';
+ });
+});
@@ -111,96 +125,15 @@
+
-
-
-
-
-
-
-
-
-
-
- Sample search: "Find recent methane emission reports for California dairy farms"
-