From 6b14d1a5627d38572e45c49b5779db8105627e13 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Fri, 26 Jan 2024 16:13:55 +0100 Subject: [PATCH] updated rebase instructions --- docs/unsure-where-to-put/dev-notes.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/unsure-where-to-put/dev-notes.md b/docs/unsure-where-to-put/dev-notes.md index 1fe116177b..cba3713bf1 100644 --- a/docs/unsure-where-to-put/dev-notes.md +++ b/docs/unsure-where-to-put/dev-notes.md @@ -106,12 +106,12 @@ git clone https://git.exozy.me/a/gitea.git exosy git remote add forgejo git@codeberg.org:forgejo/forgejo.git # rebase on top of forgejo/forge-development -git checkout forgejo-development +git switch forgejo-development git fetch forgejo -git rebase --onto forgejo/forgejo-development +git reset --hard origin/forgejo-development git push --force -git checkout forgejo-federated-star +git switch forgejo-federated-star git rebase forgejo-development git push --force