git-debpush: check_treesame: Show diffstat when there is a diff

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

diff --git a/git-debpush.1.pod b/git-debpush.1.pod
index 242bf677ffdadfefdf022dc33278f2cb0a946526..a554fd5695cb245d5c5609fece34cb0cafc309c4 100644 (file)
--- a/git-debpush.1.pod
+++ b/git-debpush.1.pod
@@ -146,10 +146,6 @@ upload your package.
 
 Just tag, don't push.
 
 
 Just tag, don't push.
 

-=item B<--force>|B<-f>
-
-Ignore the results of all checks designed to prevent broken uploads.
-

 =item B<-u> I<keyid>
 
 Passed on to git-tag(1).
 =item B<-u> I<keyid>
 
 Passed on to git-tag(1).


@@ -182,6 +178,46 @@ git would use if you typed "git push BRANCH".
 What distribution name to embed in the signed tag.  Defaults to
 "debian".
 
 What distribution name to embed in the signed tag.  Defaults to
 "debian".
 

+=item B<--force>|B<-f>
+
+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
+specified more than once.  Valid values for I<check> are:
+
+=over 4
+
+=item B<suite>
+
+Permit uploading to a different suite than the target of the most
+recent upload made with B<git-debpush> (e.g. when uploading to
+Debian unstable after uploading to Debian experimental).
+
+=item B<upstream-nonancestor>
+
+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<unreleased>
+
+Permit upload to a suite called UNRELEASED.
+
+=item B<dgit-view>
+
+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.
+
+=back
+

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