1 |
--- |
2 |
man/emaint.1 | 6 +++++- |
3 |
1 file changed, 5 insertions(+), 1 deletion(-) |
4 |
|
5 |
diff --git a/man/emaint.1 b/man/emaint.1 |
6 |
index 6b8fdf9..e9cfb8f 100644 |
7 |
--- a/man/emaint.1 |
8 |
+++ b/man/emaint.1 |
9 |
@@ -5,7 +5,7 @@ emaint \- performs package managment related system health checks and maintenanc |
10 |
.BR emaint |
11 |
[\fIoptions\fR] |
12 |
[\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \ |
13 |
-\fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR] |
14 |
+\fBmerges\fR | \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR] |
15 |
.SH DESCRIPTION |
16 |
The emaint program provides a command line interface to package |
17 |
management health checks and maintenance. |
18 |
@@ -31,6 +31,9 @@ Clean out old logs from the \fBPORT_LOGDIR\fR using the command |
19 |
See the \fBmake.conf\fR(5) man page for additional information as well as |
20 |
enabling the \fB'clean-logs'\fR feature in emerge to do this automatically. |
21 |
.TP |
22 |
+.BR merges |
23 |
+Scan for failed merges and attempt to fix found failed merges. |
24 |
+.TP |
25 |
.BR movebin |
26 |
Perform package move updates for binary packages located in \fBPKGDIR\fR. |
27 |
.TP |
28 |
@@ -82,6 +85,7 @@ than rsync. |
29 |
Please report bugs via http://bugs.gentoo.org/ |
30 |
.SH AUTHORS |
31 |
.nf |
32 |
+Pavel Kazakov <nullishzero@g.o> |
33 |
Mike Frysinger <vapier@g.o> |
34 |
Brian Dolbec <dolsen@g.o> |
35 |
.fi |
36 |
-- |
37 |
2.0.5 |