dgit: $isuite fixes: defer pushing and rpush_handle_protovsn_bothends in rpush

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

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index cb147b0a591b0e66a1563c1535328254b30bf363..245be4c937a744cffd16bdc7a8f709b056cd1ce3 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
 
     % dgit clone foo
     % cd foo

+    % git remote add -f upstream https://some.upstream/foo.git

 
 =back
 
 
 =back
 


@@ -217,7 +218,7 @@ 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>.
 
 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>.
+The first dgit push will require I<--overwrite>.

 
 =head1 SOURCE PACKAGE CONFIGURATION
 
 
 =head1 SOURCE PACKAGE CONFIGURATION
 


@@ -237,7 +238,7 @@ source:
 You don't need to create this file if you are using the version 1.0
 source package format.
 
 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:
 
 It is a good idea to explain how a user can obtain a break down of the
 changes to the upstream source:


@@ -262,6 +263,10 @@ See dgit(1), dgit(7) and dgit-maint-merge(7) for more information.
 
 =back
 
 
 =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
 =head1 BUILDING AND UPLOADING
 
 Use B<dgit build>, B<dgit sbuild>, B<dgit build-source>, and B<dgit