summaryrefslogtreecommitdiff
path: root/git-debrebase.1.pod
diff options
context:
space:
mode:
authorPaul Hardy <unifoundry@unifoundry.com>2019-01-09 22:35:39 -0800
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-03-01 18:06:21 +0000
commit9e94228f893936a65dea1a05758e523dc7e7d22f (patch)
treeb59901925a3843950fa2d8235ed6db6b94672c6f /git-debrebase.1.pod
parent89ddee481cef0bbe0e8f094be134625a8dccf3d2 (diff)
documentation: typo suggestions from Paul Hardy
Signed-off-by: Paul Hardy <unifoundry@gmail.com>
Diffstat (limited to 'git-debrebase.1.pod')
-rw-r--r--git-debrebase.1.pod14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 00b664b..e5b84a0 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,7 +249,7 @@ 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.
@@ -258,7 +258,7 @@ using dgit quilt-fixup instead should succeed.
=item git-debrebase convert-from-gbp [<upstream-commit-ish>]
-Cnnverts any of the following into a git-debrebase interchange branch:
+Converts any of the following into a git-debrebase interchange branch:
=over
@@ -370,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 be used only with care and
with a proper understanding of the underlying theory.
Be sure to not accidentally treat the result as
@@ -420,7 +420,7 @@ failure to find an appropriate upstream.
Directory to look in for orig tarballs.
The default is the git config option
dgit.default.build-products-dir
-or failing that, C<..>.
+or failing that, "C<..>".
Passed on to dgit, if git-debrebase invokes dgit.
=item --[no-]origs