Browse Source

More git readme

Alexandre Alapetite 9 năm trước cách đây
mục cha
commit
21954d6d83
2 tập tin đã thay đổi với 12 bổ sung3 xóa
  1. 1 0
      README.md
  2. 11 3
      cli/README.md

+ 1 - 0
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:

+ 11 - 3
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