dgit: Rationalise some messages

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 092c6e98fdb2f55e4a5ab08f20a18f705ff487dc..0f3f9c7b9e226389cff69261582b0bef2fdb38bf 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -34,17 +34,15 @@ etc.
 
 The usual workflow is:
 .br
-1.     dgit clone or fetch
+1.     \fBdgit clone\fR or \fBfetch\fR;
 .br
-2.     make, dev test and commit changes in git as desired
+2.     make, do dev tests, and commit changes in git as desired;
 .br
-3.     run dgit build, dgit sbuild or 
-dgit build-source, or generate the source and binary packages for upload
-some other way
+3.     build packages for upload, using e.g. \fBdgit sbuild\fR
 .br
-4.     do pre-upload tests of the proposed upload
+4.     do pre-upload tests of the proposed upload;
 .br
-5.     dgit push.
+5.     \fBdgit push\fR.
 .SH OPERATIONS
 .TP
 \fBdgit clone\fR \fIpackage\fP [\fIsuite\fP] [\fB./\fP\fIdir|\fB/\fP\fIdir\fR]
@@ -200,6 +198,14 @@ You will need similar enough versions of dgit on the build-host and
 the invocation host.  The build-host needs gnupg installed, with your
 public key in its keyring (but not your private key, obviously).
 .TP
+.B dgit setup-mergechangelogs
+Configures a git merge helper for the file
+.B debian/changelog
+which uses
+.BR dpkg-mergechangelogs .
+You can use this in any git repository, not just ones used with
+the other dgit operations.
+.TP
 .B dgit quilt-fixup
 `3.0 (quilt)' format source packages need changes representing not
 only in-tree but also as patches in debian/patches.  dgit quilt-fixup