dgit.1: drop remark about sbuild not building arch-independent

[dgit.git] / git-debrebase.5.pod

diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index f641a70fe756fd8147c82e86c40335d26041c29b..d55033b300814470939ce6135a1209f1991c8cb5 100644 (file)
--- a/git-debrebase.5.pod
+++ b/git-debrebase.5.pod
@@ -146,7 +146,7 @@ See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>.
 
 git-debrebase has one primary branch,
 the B<interchange branch>.
 
 git-debrebase has one primary branch,
 the B<interchange branch>.

-This branch is found on Debian contributor's workstations
+This branch is found on Debian contributors' workstations

 (typically, a maintainer would call it B<master>),
 in the Debian dgit git server as the suite branch (B<dgit/dgit/sid>)
 and on other git servers which support Debian work
 (typically, a maintainer would call it B<master>),
 in the Debian dgit git server as the suite branch (B<dgit/dgit/sid>)
 and on other git servers which support Debian work


@@ -175,7 +175,7 @@ the upstream commits).
 The breakwater does not contain any representation of
 the delta queue (not even debian/patches).
 The part of the breakwater processed by git-debrebase
 The breakwater does not contain any representation of
 the delta queue (not even debian/patches).
 The part of the breakwater processed by git-debrebase

-is the part since the most reecent B<anchor>,
+is the part since the most recent B<anchor>,

 which is usually a special merge generated by git-debrebase.
 
 When working, locally,
 which is usually a special merge generated by git-debrebase.
 
 When working, locally,


@@ -255,7 +255,7 @@ a representation of the delta queue:
 =item Delta queue commits
 
 Zero or more single-parent commits
 =item Delta queue commits
 
 Zero or more single-parent commits

-contaioning only changes to upstream files.
+containing only changes to upstream files.

 
 =back
 
 
 =back
 


@@ -266,7 +266,7 @@ branch state is also B<rebasing>.
 It has the same contents as the laundered state,
 except that it may contain,
 additionally,
 It has the same contents as the laundered state,
 except that it may contain,
 additionally,

-in B<in any order but after the breakwater>:
+B<in any order but after the breakwater>:

 
 =over
 
 
 =over
 


@@ -378,8 +378,11 @@ from the interchange branch and no pseudomerge is needed.
 When ffq-prev is not present,
 C<refs/debrebase-last/B> records some ancestor of refs/B,
 (usually, the result of last stitch).
 When ffq-prev is not present,
 C<refs/debrebase-last/B> records some ancestor of refs/B,
 (usually, the result of last stitch).

-This can be used to quickly determine whether refs/B
-is being maintained in git-debrebase form.
+This is used for status printing and some error error checks -
+especially for printing guesses about what a problem is.
+To determine whether a branch
+is being maintained in git-debrebase form
+it is necessary to walk its history.

 
 =head1 OTHER MERGES
 
 
 =head1 OTHER MERGES
 


@@ -388,7 +391,7 @@ general merges on any of the relevant branches.
 For this reason the tools will try to help the user
 avoid divergence of the interchange branch.
 
 For this reason the tools will try to help the user
 avoid divergence of the interchange branch.
 

-See dgit-maint-rebase(7)
+See dgit-maint-debrebase(7)

 for a discussion of what kinds of behaviours
 should be be avoided
 because
 for a discussion of what kinds of behaviours
 should be be avoided
 because


@@ -416,7 +419,7 @@ so we can at least detect unsupported merges.
 
 =head1 LEGAL OPERATIONS
 
 
 =head1 LEGAL OPERATIONS
 

-The following basic operations follows from this model
+The following basic operations follow from this model

 (refer to the diagram above):
 
 =over
 (refer to the diagram above):
 
 =over


@@ -469,7 +472,7 @@ so that git log shows the packaging history.)
 =item Stitch 
 
 Make a pseudomerge,
 =item Stitch 
 
 Make a pseudomerge,

-whose contributing parent to is the unstitched branch
+whose contributing parent is the unstitched branch

 and
 whose overwritten parent is ffq-prev,
 consuming ffq-prev in the process
 and
 whose overwritten parent is ffq-prev,
 consuming ffq-prev in the process


@@ -480,7 +483,7 @@ or perhaps a laundered branch with a quilt patch addition commit.
 =item Commit quilt patches
 
 To generate a tree which can be represented as a
 =item Commit quilt patches
 
 To generate a tree which can be represented as a

-3.0 (quilt) .dsc source packages,
+3.0 (quilt) .dsc source package,

 the delta queue must be reified inside the git tree
 in B<debian/patches/>.
 These patch files can be stripped out and/or regenerated as needed.
 the delta queue must be reified inside the git tree
 in B<debian/patches/>.
 These patch files can be stripped out and/or regenerated as needed.


@@ -512,7 +515,7 @@ For these reasons,
 it is better to use git-debrebase and
 let it choose the base
 for your rebase.
 it is better to use git-debrebase and
 let it choose the base
 for your rebase.

-If you do realise you have make this mistake,
+If you do realise you have made this mistake,

 it is best to use the reflog to recover to a suitable
 good previous state.
 
 it is best to use the reflog to recover to a suitable
 good previous state.
 


@@ -551,21 +554,21 @@ in the messages of commits it generates.
 
 The general form is
 
 
 The general form is
 

-  [git-debrebase[ COMMIT-TYPE [ ARGS...]]: PROSE, MORE PROSE]
+  [git-debrebase COMMIT-TYPE [ ARGS...]: PROSE, MORE PROSE]

 
 git-debrebase treats anything after the colon as a comment,
 paying no attention to PROSE.
 
 The full set of annotations is:
 
 git-debrebase treats anything after the colon as a comment,
 paying no attention to PROSE.
 
 The full set of annotations is:

-  [git-debrebase: split mixed commit, debian part]
-  [git-debrebase: split mixed commit, upstream-part]
-  [git-debrebase: convert dgit import, debian changes]
+  [git-debrebase split: mixed commit, debian part]
+  [git-debrebase split: mixed commit, upstream-part]
+  [git-debrebase convert dgit import: debian changes]

   [git-debrebase anchor: convert dgit import, upstream changes]
 
   [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]
   [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]
   [git-debrebase anchor: convert dgit import, upstream changes]
 
   [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]
   [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]

-  [git-debrebase: new upstream NEW-UPSTREAM-VERSION, changelog]
-  [git-debrebase: export and commit patches]
+  [git-debrebase changelog: new upstream NEW-UPSTREAM-VERSION]
+  [git-debrebase make-patches: export and commit patches]

 
   [git-debrebase convert-from-gbp: drop patches]
   [git-debrebase anchor: declare upstream]
 
   [git-debrebase convert-from-gbp: drop patches]
   [git-debrebase anchor: declare upstream]


@@ -574,6 +577,8 @@ The full set of annotations is:
   [git-debrebase merged-breakwater: constructed from vanilla merge]
 
   [git-debrebase convert-to-gbp: commit patches]
   [git-debrebase merged-breakwater: constructed from vanilla merge]
 
   [git-debrebase convert-to-gbp: commit patches]

+  [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]
+  [git-debrebase convert-from-dgit-view drop-patches]

 
 Only anchor merges have the C<[git-debrebase anchor: ...]> tag.
 Single-parent anchors are not generated by git-debrebase,
 
 Only anchor merges have the C<[git-debrebase anchor: ...]> tag.
 Single-parent anchors are not generated by git-debrebase,