--- a/docs/html/push.html Sat Aug 05 11:33:17 2017 +0200 +++ b/docs/html/push.html Sat Aug 05 13:35:27 2017 +0200 @@ -68,9 +68,9 @@ <p><strong><code>push [-cld] <directory></code></strong></p> <p>Pushes all local changes to the server. This uploads all locally modified files and deletes all locally deleted files on the server.</p> <p>If conflict detection is not disabled, all files that are also modified on the server will be skipped.</p> -<p><strong><code>-c</code></strong> Disable conflict detection. This always overrides files on the server</p> +<p><strong><code>-c</code></strong> Disable conflict detection. This always overwrites files on the server</p> <p><strong><code>-l</code></strong> Lock the repository before accessing it. After <code>push</code> completed, the repository is unlocked</p> -<p><strong><code>-d</code></strong> Don't lock the repository</p> +<p><strong><code>-d</code></strong> Don't lock the repository (default)</p> </div> <!-- end content --> </body>