changelog: finalise 2.13

[dgit.git] / dgit-maint-merge.7.pod

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 5867a6b3ab681f7bed23a756fafef987192ab1ba..dc5bfa34043dd1dac121f416b3d2bc3ce444c0ad 100644 (file)
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -187,6 +187,7 @@ this workflow.  It should be skipped when debianising a new package.
 
     % dgit clone foo
     % cd foo
+    % git remote add -f upstream https://some.upstream/foo.git
 
 =back
 
@@ -201,6 +202,14 @@ First, dump any existing patch queue:
 
 =back
 
+Then make new upstream tags available:
+
+=over 4
+
+    % git remote add -f upstream https://some.upstream/foo.git
+
+=back
+
 Now you simply need to ensure that your git HEAD is dgit-compatible,
 i.e., it is exactly what you would get if you ran B<dpkg-buildpackage
 -i\.git/ -I.git -S> and then unpacked the resultant source package.
@@ -209,6 +218,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 first dgit push will require I<--overwrite>.
+
 =head1 SOURCE PACKAGE CONFIGURATION
 
 =head2 debian/source/options