|
@@ -154,7 +154,7 @@ while (($#)); do
|
|
|
NO_UPDATE_COMPOSE=y
|
|
NO_UPDATE_COMPOSE=y
|
|
|
;;
|
|
;;
|
|
|
--help|-h)
|
|
--help|-h)
|
|
|
- echo './update.sh [-c|--check, --ours, --gc, --skip-start, -h|--help]
|
|
|
|
|
|
|
+ echo './update.sh [-c|--check, --ours, --gc, --no-update-compose, --prefetch, --skip-start, -f|--force, -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 option "ours" to solve conflicts in favor of non-mailcow code (local changes over remote changes), not recommended!
|
|
--ours - Use merge strategy option "ours" to solve conflicts in favor of non-mailcow code (local changes over remote changes), not recommended!
|
Peter