dgit(1): Cover more cases of --overwrite and --deliberately

[dgit.git] / git-debpush.1.pod

diff --git a/git-debpush.1.pod b/git-debpush.1.pod
index 429148d40181023c23d04e8099763ac6bdb6e7e9..3e065ab6dc4cc45e1060d93eebd519d07bb37cd7 100644 (file)
--- a/git-debpush.1.pod
+++ b/git-debpush.1.pod
@@ -109,6 +109,8 @@ You are using git-dpm(1)'s branch format.
 You are using the 'bare debian' branch format, with the upstream
 source in the form of an upstream tag.
 
 You are using the 'bare debian' branch format, with the upstream
 source in the form of an upstream tag.
 

+B<--quilt=baredebian+git> is an alias for B<--quilt=baredebian>.
+

 =item B<--quilt=linear>
 
 You are using the 'manually maintained applied' branch format or
 =item B<--quilt=linear>
 
 You are using the 'manually maintained applied' branch format or


@@ -185,7 +187,12 @@ Ignore the results of all checks designed to prevent broken uploads.
 =item B<--force>=I<check>[,I<check>] ...
 
 Override individual checks designed to prevent broken uploads.  May be
 =item B<--force>=I<check>[,I<check>] ...
 
 Override individual checks designed to prevent broken uploads.  May be

-specified more than once.  Valid values for I<check> are:
+specified more than once.
+
+Using B<--force> or B<--force=>I<check> might cause the upload to fail
+at some later point in the process.
+
+Valid values for I<check> are:

 
 =over 4
 
 
 =over 4
 


@@ -200,6 +207,32 @@ Debian unstable after uploading to Debian experimental).
 Ignore the fact that the upstream tag is not an ancestor of the branch
 to be tagged (skipping this check is implied by B<--quilt=baredebian>).
 
 Ignore the fact that the upstream tag is not an ancestor of the branch
 to be tagged (skipping this check is implied by B<--quilt=baredebian>).
 

+=item B<upstream-nonidentical>
+
+Ignore any differences between the upstream source in the upstream tag
+and the upstream source in the branch to be tagged (this check is only
+run when using B<--quilt=gbp> or B<--quilt=unapplied>).
+
+=item B<patches-applicable>
+
+Ignore any failures of the following two checks:
+
+=over 4
+
+=item
+
+With B<--quilt=gbp>, B<--quilt=unapplied>, B<--quilt=baredebian>,
+B<--quilt=dpm>, and B<--quilt=nofix>, the quilt patches should apply
+cleanly to the upstream source with git-apply(1).
+
+=item
+
+With B<--quilt=dpm> and B<--quilt=nofix>, applying the quilt patches
+to the upstream source should produce exactly the source tree to be
+tagged.
+
+=back
+

 =item B<unreleased>
 
 Permit upload to a suite called UNRELEASED.
 =item B<unreleased>
 
 Permit upload to a suite called UNRELEASED.


@@ -210,8 +243,19 @@ Ignore apparently pushing the dgit view of a package (as produced by
 B<dgit clone>) to the maintainer branch, where the dgit view and the
 maintainer view of the package are not identical.
 
 B<dgit clone>) to the maintainer branch, where the dgit view and the
 maintainer view of the package are not identical.
 

+=item B<unstitched>
+
+Ignore the fact that the branch to be pushed seems to be a
+git-debrebase(1) branch in an unstitched state (see git-debrebase(5)).
+

 =back
 
 =back
 

+=item B<detached>
+
+Ignore the fact that HEAD is to be tagged, but HEAD is detached (this
+check is only run when B<--branch=HEAD> or no B<--branch> option is
+specified).
+

 =back
 
 =head1 SEE ALSO
 =back
 
 =head1 SEE ALSO