From cc074a8828cb1aebe6b7317c6a05035c6a6ae87a Mon Sep 17 00:00:00 2001 From: defiQUG Date: Tue, 28 Apr 2026 01:18:23 -0700 Subject: [PATCH] docs(git): parity checklist before audit submission (origin/gitea/master) Made-with: Cursor --- scripts/git/README-gitea-proxmox-sync.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/git/README-gitea-proxmox-sync.md b/scripts/git/README-gitea-proxmox-sync.md index fa686477..4c47434a 100644 --- a/scripts/git/README-gitea-proxmox-sync.md +++ b/scripts/git/README-gitea-proxmox-sync.md @@ -21,3 +21,23 @@ Resolve by either: Do **not** force-push to **gitea** unless you intend to rewrite shared history. CyberSecur-related commits exist on **GitHub `origin`**; **gitea** may lack them until a successful merge and push. + +## Parity check (e.g. before audit submission) + +All three should match (same commit hash): + +```bash +git fetch origin +git fetch gitea +git rev-parse master origin/master gitea/master +``` + +If local `master` lags but is a **fast-forward** behind (no local-only commits you need to keep), update and align: + +```bash +git checkout master +git pull origin master --ff-only +# or: git merge --ff-only gitea/master +``` + +If you have uncommitted changes, **stash** first (`git stash push -u` if untracked files would be overwritten), then pull, then `git stash pop` as needed. After alignment, `git push origin master` and `git push gitea master` should report **up to date** when remotes already share the tip.