TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

improve git-setup-doc

Browse source
This commit is contained in:
Michael Jerger 2023-11-06 09:12:09 +01:00
parent cde603dd0e
commit 1f80e99857
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docs/unsure-where-to-put/dev-notes.md
View file

@ -14,8 +14,15 @@ TAGS="sqlite" make build generate-swagger
# sync base branch # 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 checkout forgejo-development
git rebase --onto forgejo/forgejo-development git rebase --onto forgejo/forgejo-development
git push --force git push --force
@ -24,5 +31,6 @@ git checkout forgejo-federated-star
git rebase forgejo-development git rebase forgejo-development
git push --force git push --force
# continue local development after rebase & force-push has happened
git reset --hard origin/forgejo-federated-star git reset --hard origin/forgejo-federated-star
``` ```