Merge branch 'master' of github.com:gitlabhq/gitlabhq

0a23688c · Dmitriy Zaporozhets · 2cd501f7 · 58faf307 · 0a23688c
Commit 0a23688c authored Apr 21, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

doc/raketasks/backup_restore.md doc/raketasks/backup_restore.md +1 -0

No files found.
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -162,6 +162,7 @@ Options:

 ```
 BACKUP=timestamp_of_backup (required if more than one backup exists)
+force=yes (do not ask if the authorized_keys file should get regenerated)
 ```

 Example output: