From 1f80e99857b1ba9650439eb129150151f393c756 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Mon, 6 Nov 2023 09:12:09 +0100 Subject: [PATCH] improve git-setup-doc --- docs/unsure-where-to-put/dev-notes.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/unsure-where-to-put/dev-notes.md b/docs/unsure-where-to-put/dev-notes.md index 90e9d8c035..31943a9816 100644 --- a/docs/unsure-where-to-put/dev-notes.md +++ b/docs/unsure-where-to-put/dev-notes.md @@ -14,8 +14,15 @@ TAGS="sqlite" make build generate-swagger # sync base branch ``` -git remote add git@codeberg.org:forgejo/forgejo.git +# add remotes +git remote add forgejo git@codeberg.org:forgejo/forgejo.git +git remote add exozy https://git.exozy.me/a/gitea.git +# get the exozy development local +git fetch exozy +git switch -c exozy exozy/main + +# rebase on top of forgejo/forge-development git checkout forgejo-development git rebase --onto forgejo/forgejo-development git push --force @@ -24,5 +31,6 @@ git checkout forgejo-federated-star git rebase forgejo-development git push --force +# continue local development after rebase & force-push has happened git reset --hard origin/forgejo-federated-star ```