From 37b2196023b544cdf34b375ac19a0f84a9ba27cb Mon Sep 17 00:00:00 2001 From: ben Date: Tue, 17 Mar 2026 09:23:00 -0400 Subject: [PATCH] added git notes --- pm/scrape-giant.org | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pm/scrape-giant.org b/pm/scrape-giant.org index 2daa55c..4e42e87 100644 --- a/pm/scrape-giant.org +++ b/pm/scrape-giant.org @@ -27,6 +27,8 @@ carry forward image url 3. build observed-product atble from enriched items * git issues + +** ssh / access to gitea ssh://git@192.168.1.207:2020/ben/scrape-giant.git https://git.hgsky.me/ben/scrape-giant.git @@ -44,6 +46,25 @@ git remote set-url gitea git@gitea:ben/scrape-giant.git on local network: use ssh to 192.168.1.207:2020 from elsewhere/public: use https to git.hgsky.me/... unless you later expose ssh properly +** stash +z z to stash local work only + take care not to add ignored files which will add the venv and `__pycache__` + +z p to pop the stash back + +** creating remote branches +P p, magit will suggest upstream (gitea), select and Enter and it will be created + +** cherry-picking +b b : switch to desired branch (review) +l B : open reflog for local branches + (my changes were committed to local cx but not pushed to gitea/cx) +put point on the commit you want; did this in sequence +A A : cherry pick commit to current branch + minibuffer will show the commit and all branches, leave it on that commit + the final commit was not shown by hash, just the branch cx + since (local) cx was caught up with that branch + * giant requests ** item: get: