X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=245be4c937a744cffd16bdc7a8f709b056cd1ce3;hp=5867a6b3ab681f7bed23a756fafef987192ab1ba;hb=d4f8df7adccd9ed9a0dd1cd1837ed7782557a828;hpb=568d065af3a870c52c0b670603fd8853e7cc2a14

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 5867a6b3..245be4c9 100644
--- 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
@@ -227,7 +238,7 @@ source:
 You don't need to create this file if you are using the version 1.0
 source package format.
 
-=head2 Sample text for README.source
+=head2 Sample text for debian/source/patch-header
 
 It is a good idea to explain how a user can obtain a break down of the
 changes to the upstream source:
@@ -252,6 +263,10 @@ See dgit(1), dgit(7) and dgit-maint-merge(7) for more information.
 
 =back
 
+Alternatively, this text could be added to README.source. However,
+this might distract from more important information present in the
+latter file.
+
 =head1 BUILDING AND UPLOADING
 
 Use B<dgit build>, B<dgit sbuild>, B<dgit build-source>, and B<dgit