X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase.1.pod;h=cbdf292b2812e616248c06cfb8908374680d8c06;hp=04a57ee25a5ecbb9c76d04cb407faa3c5b83beb0;hb=fe1e06de2358fc0788604ada99baa5752c1e0e62;hpb=33ab412087f8c2403bd0f79f787d04b09e565ffb

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 04a57ee2..cbdf292b 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -19,7 +19,7 @@ L<dgit-maint-debrebase(7)>.
 For background, theory of operation,
 and definitions see L<git-debrebase(5)>.
 
-You should read this manpage in cojnunction with
+You should read this manpage in conjunction with
 L<git-debrebase(5)/TERMINOLOGY>,
 which defines many important terms used here.
 
@@ -59,7 +59,7 @@ It is hazardous to use plain git-rebase on a git-debrebase branch,
 because git-rebase has a tendency to start the rebase
 too far back in history,
 and then drop important commits.
-Soo L<git-debrebase(5)/ILLEGAL OPERATIONS>
+See L<git-debrebase(5)/ILLEGAL OPERATIONS>
 
 =item git-debrebase status
 
@@ -155,7 +155,7 @@ the whole new upstream operation is aborted,
 except for the laundering.
 
 <new-version>
-may be whole new Debian version, including revision,
+may be a whole new Debian version, including revision,
 or just the upstream part,
 in which case -1 will be appended
 to make the new Debian version.
@@ -249,23 +249,44 @@ 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.)
+(The message can be suppressed 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-unapplied [<upstream-commit-ish>]
+
 =item git-debrebase convert-from-gbp [<upstream-commit-ish>]
 
-Cnnverts a gbp patches-unapplied branch
-(not a gbp pq patch queue branch)
-into a git-debrebase interchange branch.
+Converts any of the following into a git-debrebase interchange branch:
+
+=over
+
+=item
+
+a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)
+
+=item
+
+a patches-unapplied git packaging branch containing debian/patches,
+as used with quilt
+
+=item
+
+a git branch for a package which has no Debian delta -
+ie where upstream files are have not been modified in Debian,
+so there are no patches
+
+=back
+
+(These two commands operate identically and are simply aliases.)
 
-This is done by generating a new anchor merge,
-converting the quilt patches as a delta queue,
+The conversion is done by generating a new anchor merge,
+converting any quilt patches as a delta queue,
 and dropping the patches from the tree.
 
 The upstream commit-ish should correspond to
-the gbp upstream branch, if there is one.
+the upstream branch or tag, if there is one.
 It is a snag if it is not an ancestor of HEAD,
 or if the history between the upstream and HEAD
 contains commits which make changes to upstream files.
@@ -284,14 +305,14 @@ and if it finds it will make a pseduomerge so that
 your new git-debrebase view is appropriately fast forward.
 
 The result is a well-formed git-debrebase interchange branch.
-The result is also fast-forward from the gbp branch.
+The result is also fast-forward from the original branch.
 
 It is a snag if the new branch looks like it will have diverged,
 just as for a laundering/unstitching call to git-debrebase;
 See L</Establish the current branch's ffq-prev>, below.
 
 Note that it is dangerous not to know whether you are
-dealing with a gbp patches-unapplied branch containing quilt patches,
+dealing with a (gbp) patches-unapplied branch containing quilt patches,
 or a git-debrebase interchange branch.
 At worst,
 using the wrong tool for the branch format might result in
@@ -349,7 +370,7 @@ and any ffq-prev is deleted.
 
 This is provided mostly for the test suite
 and for unusual situations.
-It should only be used with a care and 
+It should only be used with care and 
 with a proper understanding of the underlying theory.
 
 Be sure to not accidentally treat the result as