From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 19 Dec 2016 12:55:29 +0000 (+0000)
Subject: dgit-maint-merge(7): After converting, need --overwrite
X-Git-Tag: archive/debian/2.12~19^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ff2ebaf0a41a3edc8f71f778082f0cb3d34610e0;p=dgit.git

dgit-maint-merge(7): After converting, need --overwrite

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
---

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 5867a6b3..62c8c1f8 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -209,6 +209,8 @@ To achieve this, you might need to delete
 I<debian/source/local-options>.  One way to have dgit check your
 progress is to run B<dgit build-source>.
 
+The dgit push will require I<--overwrite>.
+
 =head1 SOURCE PACKAGE CONFIGURATION
 
 =head2 debian/source/options