Diffstat (limited to 'git-debrebase.5.pod')
1 files changed, 7 insertions, 6 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index 5cfa376..e445c0e 100644
@@ -24,7 +24,7 @@ itself is not very suitable for use by Debian derivatives,
to work on packages inherited from Debian,
because it assumes that you want to throw away any packaging
provided by your upstream.
-However, of git-debrebase in Debian does not make anything harder for
+However, use of git-debrebase in Debian does not make anything harder for
derivatives, and it can make some things easier.
@@ -177,7 +177,7 @@ known as B<unstitched>.
While a branch is unstitched,
it is not in interchange format.
The previous interchange branch tip
-tip is recorded,
so that the previous history
and the user's work
can later be
@@ -381,8 +381,8 @@ 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.
-See dgit-maint-rebase(7) XXX TBD
-for a discussio of what kinds of behaviours
+for a discussion of what kinds of behaviours
should be be avoided
they might generate such merges.
@@ -401,7 +401,7 @@ Nonlinear (merging) history in the breakwater branch is
in principle tolerable,
but each of the parents would have to be, in turn,
-and difficult qeustions arise if they don't have the same anchor.
+and difficult questions arise if they don't have the same anchor.
We use the commit message annotation to
distinguish the special anchor merges from other general merges,
@@ -511,7 +511,8 @@ The full set of annotations is:
Only anchor merges have the C<[git-debrebase anchor: ...]> tag.
Single-parent anchors are not generated by git-debrebase,
-and when made manually should not be tagged.
+and when made manually should not
+contain any C<[git-debrebase ...]> annotation.
The C<split mixed commit> and C<convert dgit import>
tags are added to the pre-existing commit message,