projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
36b4850
)
Add 'automatically resolved' blockers to the --pretend docs. (trunk r12120)
author
Zac Medico
<zmedico@gentoo.org>
Sat, 29 Nov 2008 06:39:43 +0000
(06:39 -0000)
committer
Zac Medico
<zmedico@gentoo.org>
Sat, 29 Nov 2008 06:39:43 +0000
(06:39 -0000)
svn path=/main/branches/2.1.6/; revision=12121
man/emerge.1
patch
|
blob
|
history
diff --git
a/man/emerge.1
b/man/emerge.1
index e4a3842c4125ff0ce8aa611faa5b7f7d6956a43a..1a28365abd64ab4e47047e849d3811590de17c73 100644
(file)
--- a/
man/emerge.1
+++ b/
man/emerge.1
@@
-402,7
+402,8
@@
R replacing (remerging same version))
F fetch restricted (must be manually downloaded)
f fetch restricted (already downloaded)
I interactive (requires user input)
-B blocked by an already installed package
+B blocked by another package (unresolved conflict)
+b blocked by another package (automatically resolved conflict)
.TE
.TP
.BR "\-\-quiet " (\fB\-q\fR)