dgit: Provide "dgit setup-mergechangelogs" operation

diff --git a/dgit b/dgit
index 73184fbd7ff75ea30cebe73ec512fef24e6dfa6a..3ef43485ffe088b1ef5cc7bf87e990de143d8a24 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2802,6 +2802,11 @@ sub cmd_clone_dgit_repos_server {
     exec @cmd or fail "exec git clone: $!\n";
 }
 
+sub cmd_setup_mergechangelogs {
+    badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
+    setup_mergechangelogs();
+}
+
 #---------- argument parsing and main program ----------
 
 sub cmd_version {

diff --git a/dgit.1 b/dgit.1
index 9029f46e014b42cf147b66039d55949bb1f6a6ed..0f3f9c7b9e226389cff69261582b0bef2fdb38bf 100644 (file)
--- 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