X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.1;h=0f3f9c7b9e226389cff69261582b0bef2fdb38bf;hp=9029f46e014b42cf147b66039d55949bb1f6a6ed;hb=395e3a0f5c1d2541a84ac6105f02c7eac34f434b;hpb=c315665ee5ff99ad78b4621abfd6be0d73b4e0c9

diff --git a/dgit.1 b/dgit.1
index 9029f46e..0f3f9c7b 100644
--- a/dgit.1
+++ b/dgit.1
@@ -198,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