From 1c3159058fd256ec7163a29c9865dbd3dbe05f17 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 15 Mar 2021 00:00:25 +0100 Subject: Quick update the doc for master renaming to edge --- docs/en/developers/02_Github.md | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'docs/en/developers/02_Github.md') diff --git a/docs/en/developers/02_Github.md b/docs/en/developers/02_Github.md index 953785d4f..7a7769caa 100644 --- a/docs/en/developers/02_Github.md +++ b/docs/en/developers/02_Github.md @@ -1,6 +1,7 @@ # Branching ## Basic + If you are new to Git, here are some of the resources you might find useful: * [GitHub's blog post](https://github.com/blog/120-new-to-git) @@ -9,30 +10,35 @@ If you are new to Git, here are some of the resources you might find useful: * ## Getting the latest code from the FreshRSS repository + First you need to add the official repo to your remote repo list: -```bash + +```sh git remote add upstream git@github.com:FreshRSS/FreshRSS.git ``` You can verify the remote repo is successfully added by using: -```bash + +```sh git remote -v show ``` Now you can pull the latest development code: -```bash -git checkout master -git pull upstream master + +```sh +git checkout edge +git pull upstream edge ``` ## Starting a new development branch -```bash + +```sh git checkout -b my-development-branch ``` -# Sending a patch +## Sending a patch -```bash +```sh # Add the changed file, here actualize_script.php git add app/actualize_script.php # Commit the change and write a proper commit message -- cgit v1.2.3