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 f1edf776d64c185d22b41a016722b19e3afdd0f8..a554fd5695cb245d5c5609fece34cb0cafc309c4 100644 (file)
--- a/git-debpush.1.pod
+++ b/git-debpush.1.pod
@@ -109,11 +109,6 @@ 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.
 

-=item B<--quilt=baredebian+tarball>|B<--baredebian+tarball>
-
-You are using the 'bare debian' branch format, with the upstream
-source in the form of a tarball.
-

 =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


@@ -151,10 +146,6 @@ upload your package.
 
 Just tag, don't push.
 
 
 Just tag, don't push.
 

-=item B<--force>|B<-f>
-
-Don't perform 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).


@@ -171,11 +162,11 @@ most common case.
 =item B<--upstream=>I<TAG>
 
 When pushing a non-native package,
 =item B<--upstream=>I<TAG>
 
 When pushing a non-native package,

-git-debpush needs a tag for the upstream part of your package.
+B<git-debpush> needs a tag for the upstream part of your package.

 
 

-By default git-debpush asks git-deborig,
-which searches for a suitable tag in your tree,
-based on the upstream version.
+By default B<git-debpush> asks git-deborig(1),
+which searches for a suitable tag
+based on the upstream version in debian/changelog.

 
 =item B<--remote=>I<REMOTE>
 
 
 =item B<--remote=>I<REMOTE>
 


@@ -187,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


@@ -196,5 +227,6 @@ Git branch formats in use by Debian maintainers:
 
 =head1 AUTHOR
 
 
 =head1 AUTHOR
 

-B<git-debpush> was written by Sean Whitton <spwhitton@spwhitton.name>
-with much input from Ian Jackson <ijackson@chiark.greenend.org.uk>.
+B<git-debpush> and this manpage were written by Sean Whitton
+<spwhitton@spwhitton.name> with much input from Ian Jackson
+<ijackson@chiark.greenend.org.uk>.