diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-08 19:57:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-08 19:57:23 +0000 |
| commit | a96200f3d908429f50893339490b08306e9249de (patch) | |
| tree | aa12a5bb0043dca0b45b2a9d2700bec1eeb49695 /man | |
| parent | aee940b499df40aa957e3f059e62f0b8cf9dfd7e (diff) | |
| download | portage-a96200f3d908429f50893339490b08306e9249de.tar.gz portage-a96200f3d908429f50893339490b08306e9249de.tar.bz2 portage-a96200f3d908429f50893339490b08306e9249de.zip | |
For bug #156536, update --resume docs to show that the resume history is capable of storing two merge lists. (trunk r6742)
svn path=/main/branches/2.1.2/; revision=6762
Diffstat (limited to 'man')
| -rw-r--r-- | man/emerge.1 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index aaed8651f..1a4aea020 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -144,9 +144,13 @@ the cache. After a portage update, rsync users may find it convenient to run a sync operation. .TP .BR "\-\-resume" -Resumes the last merge operation. 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 success condition. +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 +success condition. A resume list will persist until it has been completed in +entirety or until another aborted merge list replaces it. The resume history +is capable of storing two merge lists. After one resume list completes, it is +possible to invoke \-\-resume once again in order to resume an older list. .TP .BR "\-\-search " (\fB\-s\fR) Searches for matches of the supplied string in the portage tree. |