X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.5.pod;h=c30b124dea9d7cf254107f32827a17fc9a4e2682;hb=9e94228f893936a65dea1a05758e523dc7e7d22f;hp=439fd63b89b30155960ae5821c6f19ca3571b677;hpb=89ddee481cef0bbe0e8f094be134625a8dccf3d2;p=dgit.git

diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index 439fd63b..c30b124d 100644
--- 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>.
-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
@@ -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
-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,
@@ -190,7 +190,7 @@ and the user's work
 can later be
 stitched into the fast-forwarding interchange form.
 
-An unstitched branch may be in
+An unstitched branch may be in the
 B<laundered>
 state,
 which means it has a more particular special form
@@ -255,7 +255,7 @@ a representation of the delta queue:
 =item Delta queue commits
 
 Zero or more single-parent commits
-contaioning only changes to upstream files.
+containing only changes to upstream files.
 
 =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,
-in B<in any order but after the breakwater>:
+B<in any order but after the breakwater>:
 
 =over
 
@@ -379,8 +379,8 @@ When ffq-prev is not present,
 C<refs/debrebase-last/B> records some ancestor of refs/B,
 (usually, the result of last stitch).
 This is used for status printing and some error error checks -
-especially for printing guesses what a problem is.
-To determine whether a branch is 
+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.
 
@@ -419,7 +419,7 @@ so we can at least detect unsupported merges.
 
 =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
@@ -472,7 +472,7 @@ so that git log shows the packaging history.)
 =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
@@ -483,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
-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.
@@ -515,7 +515,7 @@ For these reasons,
 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.