summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-06 18:56:14 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-06 18:56:14 +0000
commit9df052e840e09c51790016c2b23597c04fc20d68 (patch)
tree20fa24dffa6321b2a98a4187a81cc6e9a5dff629 /man
parentAdd a note about --accept-properties and exclusion of interactive updates. (diff)
downloadportage-multirepo-9df052e840e09c51790016c2b23597c04fc20d68.tar.gz
portage-multirepo-9df052e840e09c51790016c2b23597c04fc20d68.tar.bz2
portage-multirepo-9df052e840e09c51790016c2b23597c04fc20d68.zip
Bug #287870 - Add -r option as short version of --resume.
svn path=/main/trunk/; revision=14504
Diffstat (limited to 'man')
-rw-r--r--man/emerge.12
1 files changed, 1 insertions, 1 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index efe58306..23fb296b 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -182,7 +182,7 @@ a sync operation. In order to specify parallel \fB\-\-regen\fR behavior, use
the \fB\-\-jobs\fR and \fB\-\-load\-average\fR options. If you would like to
generate and distribute cache for use by others, use \fBegencache\fR(1).
.TP
-.BR "\-\-resume"
+.BR "\-\-resume" (\fB\-r\fR)
Resumes the most recent merge list that has been aborted due to an error.
Please note that this operation will only return an error on failure. If there
is nothing for portage to do, then portage will exit with a message and a