dgit-maint-gbp(7): Mention --overwrite

[dgit.git] / dgit-sponsorship.7.pod

diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod
index 67d064767eb200e5f25c87a12a96c8f7c50d890c..9fe8abc7809e37efa90f56b568f45211d4e5b05a 100644 (file)
--- a/dgit-sponsorship.7.pod
+++ b/dgit-sponsorship.7.pod
@@ -59,7 +59,7 @@ options to dgit, or
 C<dgit --gbp> or C<dgit --dpm>,
 you must specify that in your handoff email - see below.
 
 C<dgit --gbp> or C<dgit --dpm>,
 you must specify that in your handoff email - see below.
 

-=head1 GIT+ORIGS BASED HANDOFF
+=head2 git+origs based handoff

 
 The elements of the handoff consists of:
 
 
 The elements of the handoff consists of:
 


@@ -92,7 +92,9 @@ the elements above should be a in a single, signed, message.
 This could be an RFS submission
 against the sponsorship-requests pseudo-package.
 
 This could be an RFS submission
 against the sponsorship-requests pseudo-package.
 

-=head2 git branch
+=head3 git branch
+
+=over 4

 
 The sponsee should push their HEAD as a git branch
 to any suitable git server.
 
 The sponsee should push their HEAD as a git branch
 to any suitable git server.


@@ -108,7 +110,11 @@ Instead, the sponsee should include the
 git commit id of their HEAD
 in their handover email.
 
 git commit id of their HEAD
 in their handover email.
 

-=head2 orig tarballs
+=back
+
+=head3 orig tarballs
+
+=over 4

 
 If there are any .origs that are not in the archive already,
 the sponsor will need them as part of the upload.
 
 If there are any .origs that are not in the archive already,
 the sponsor will need them as part of the upload.


@@ -134,7 +140,11 @@ if they are small.
 The sponsee should quote sha256sums of the .origs in their
 handoff email.
 
 The sponsee should quote sha256sums of the .origs in their
 handoff email.
 

-=head2 quilt options
+=back
+
+=head3 quilt options
+
+=over 4

 
 Some workflows involve git branches which are not natively
 dgit-compatible.
 
 Some workflows involve git branches which are not natively
 dgit-compatible.


@@ -168,7 +178,8 @@ Use C<git fetch> or C<git clone> to obtain the git branch
 prepared by your sponsee,
 and obtain any .origs mentioned by the sponsee
 (to extract .origs committed with pristine-tar,
 prepared by your sponsee,
 and obtain any .origs mentioned by the sponsee
 (to extract .origs committed with pristine-tar,

-you can use origtargz(1).)
+you can use origtargz(1),
+or use "gbp clone --pristine-tar".)

 
 Check the git commit ID of the sponsee's branch tip,
 and the sha256sums of the .origs,
 
 Check the git commit ID of the sponsee's branch tip,
 and the sha256sums of the .origs,