aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-05-25 14:02:55 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-05-25 14:02:55 +0200
commit21954d6d83b94bd9ad4d763fb237710e71f14de1 (patch)
tree63f9c337de5d5383a12a656faafa0876c030db39
parentf57aaebeb854a617749424f3d62464aceaed98c4 (diff)
More git readme
-rw-r--r--README.md1
-rw-r--r--cli/README.md14
2 files changed, 12 insertions, 3 deletions
diff --git a/README.md b/README.md
index 8e0d8bac9..8b87ecb8f 100644
--- a/README.md
+++ b/README.md
@@ -105,6 +105,7 @@ cd /usr/share/FreshRSS
sudo git pull
sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
```
+See more commands and git commands in the [Command-Line Interface documentation](./cli/README.md).
## Access control
It is needed for the multi-user mode to limit access to FreshRSS. You can:
diff --git a/cli/README.md b/cli/README.md
index aa3a6bf27..fff16f53d 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -108,12 +108,19 @@ sudo git checkout -b dev origin/dev
# Check out a specific version of FreshRSS
# See release names on https://github.com/FreshRSS/FreshRSS/releases
+# You will then need to manually change version
+# or checkout master or dev to get new versions
cd /usr/share/FreshRSS
sudo git checkout 1.7.0
-# Check whether there is a new version of FreshRSS
+# Verify what branch is used
cd /usr/share/FreshRSS
-sudo git fetch
+sudo git branch
+
+# Check whether there is a new version of FreshRSS,
+# assuming you are on the /master or /dev branch
+cd /usr/share/FreshRSS
+sudo git fetch --all
sudo git status
# Discard manual changes (do a backup before)
@@ -126,7 +133,8 @@ sudo rm data/do-install.txt
cd /usr/share/FreshRSS
sudo git clean -f -d
-# Update to a newer version of FreshRSS
+# Update to a newer version of FreshRSS,
+# assuming you are on the /master or /dev branch
cd /usr/share/FreshRSS
sudo git pull