paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Update] Update with "ours" is not recommended

master
andryyy 2020-05-30 22:24:57 +02:00
parent 7e1c3a0214
commit b30b0fe5a6
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
update.sh
View File

@ -157,7 +157,7 @@ while (($#)); do
echo './update.sh [-c|--check, --ours, --gc, --skip-start, -h|--help] echo './update.sh [-c|--check, --ours, --gc, --skip-start, -h|--help]
-c|--check - Check for updates and exit (exit codes => 0: update available, 3: no updates) -c|--check - Check for updates and exit (exit codes => 0: update available, 3: no updates)
--ours - Use merge strategy "ours" to solve conflicts in favor of non-mailcow code (local changes) --ours - Use merge strategy "ours" to solve conflicts in favor of non-mailcow code (local changes over remote changes), not recommended!
--gc - Run garbage collector to delete old image tags --gc - Run garbage collector to delete old image tags
--no-update-compose - Do not update docker-compose --no-update-compose - Do not update docker-compose
--prefetch - Only prefetch new images and exit (useful to prepare updates) --prefetch - Only prefetch new images and exit (useful to prepare updates)