X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=6a98ed2d7bbceb1157c2c86a8b3b1e307bc55ba1;hb=11f0fbcd7d0697ac075931a4f86d83f2fc944cf7;hp=27b5c9337596e0235957bfbda32f5ad36a4edf07;hpb=77f1c1c558d5492e70c6121a6a8cda3f658cd9ca;p=dgit.git

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 27b5c933..6a98ed2d 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -142,7 +142,10 @@ The <upstream-details> are, optionally, in order:
 =item <upstream-commit-ish>
 
 The new upstream branch (or commit-ish).
-Default is C<upstream>.
+The default is to look for one of these tags, in this order:
+U vU upstream/U;
+where U is the new upstream version.
+(This is the same algorithm as L<git-deborig(1)>.)
 
 It is a snag if the upstream contains a debian/ directory;
 if forced to proceed,
@@ -201,7 +204,7 @@ that its command line syntax is optimal.
 We may want to introduce an incompatible replacement syntax
 under the name C<new-upstream>.
 
-=item git-debrebase make-patches
+=item git-debrebase make-patches [--quiet-would-amend]
 
 Generate patches in debian/patches/
 representing the changes made to upstream files.
@@ -222,6 +225,15 @@ and all that has happened is that more
 changes to upstream files have been committed,
 running it again can add the missing patches.
 
+If the patches implied by the current branch
+are not a simple superset of those already in debian/patches,
+make-patches will fail with exit status 7,
+and an error message.
+(The message can be suppress with --quiet-would-amend.)
+If the problem is simply that
+the existing patches were not made by git-debrebase,
+using dgit quilt-fixup instead should succeed.
+
 =item git-debrebase convert-from-gbp [<upstream-commit-ish>]
 
 Cnnverts a gbp patches-unapplied branch