path: root/dgit.1
diff options
authorIan Jackson <>2015-07-26 21:37:43 +0100
committerIan Jackson <>2015-07-26 22:54:29 +0100
commitd33fa1545969c40c257a02c3a442b1e47d291b16 (patch)
treef99f4a54ee3b4f04e3dacd63f4b32c888bd4b563 /dgit.1
parentb1772b364e75b32c413db7060a0adf8b124c84db (diff)
Make configuration able to prevent dpkg-mergechangelogs setup.
Diffstat (limited to 'dgit.1')
1 files changed, 5 insertions, 0 deletions
diff --git a/dgit.1 b/dgit.1
index 1507d43..2b626a1 100644
--- a/dgit.1
+++ b/dgit.1
@@ -634,6 +634,11 @@ Not relevant for Debian.
.BI dgit-distro. distro .upload-host
Might be useful if you have an intermediate queue server.
+.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.
.BI dgit-distro. distro .cmd- cmd
Program to use instead of
.IR cmd .