Make configuration able to prevent dpkg-mergechangelogs setup.

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 2e862e3fdb8e73b5b27be9291eeac4c795e7bdae..2b626a1408c48f6d2ef983545c7529d2cc4300b4 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -376,7 +376,7 @@ fixing up, dgit push will fail.
 .TP
 .BI -D
 Prints debugging information to stderr.  Repeating the option produces
-more output (currently, up to -DDD is meaningfully different).
+more output (currently, up to -DDDD is meaningfully different).
 .TP
 .BI -c name = value
 Specifies a git configuration option, to be used for this run.
@@ -634,6 +634,11 @@ Not relevant for Debian.
 .BI dgit-distro. distro .upload-host
 Might be useful if you have an intermediate queue server.
 .TP
+.BI dgit-distro. distro .setup-mergechangelogs
+Whether to setup a merge driver which uses dpkg-mergechangelogs for
+debian/changelog.  True by default.  Ignored for dgit
+setup-mergechangelogs, which does it anyway.
+.TP
 .BI dgit-distro. distro .cmd- cmd
 Program to use instead of
 .IR cmd .