From da6f19f4f54e84723e9d1435bcfd4f7db8e55986 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 18 Jun 2018 01:41:53 +0100 Subject: [PATCH 1/1] git-debrebase manpages: Fix typos and etc. Signed-off-by: Ian Jackson --- debian/changelog | 2 +- git-debrebase.1.pod | 12 ++++++------ git-debrebase.5.pod | 13 +++++++------ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index c49a0abd..a70ec384 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dgit (5.1~) unstable; urgency=medium - * + * git-debrebase manpages: Fix typos and etc. -- diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 6168e144..1c3e6812 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -15,11 +15,11 @@ Debian packages based on upstream source code. This is the command line reference. Please read the tutorial -L. +L. For background, theory of operation, and definitions see L. -You should read this manpage in conjunction with +You should read this manpage in cojnunction with L, which defines many important terms used here. @@ -57,10 +57,10 @@ to distinguish them from options for git-debrebase. =item git-debrebase status -Analyise the current branch, -both in terms of its conents, +Analyses the current branch, +both in terms of its contents, and the refs which are relevant to git-debrebase, -and print a human-readable summary. +and prints a human-readable summary. Please do not attempt to parse the output; it may be reformatted or reorganised in the future. @@ -343,7 +343,7 @@ Turns snag(s) with id into warnings. Some troublesome things which git-debrebase encounters are Bs. (The specific instances are discussed -in the text for the relvant operation.) +in the text for the relevant operation.) When a snag is detected, a message is printed to stderr containing the snag id diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index 5cfa3761..e445c0e6 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -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. =head1 TERMINOLOGY @@ -177,7 +177,7 @@ known as B. While a branch is unstitched, it is not in interchange format. The previous interchange branch tip -tip is recorded, +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 +See dgit-maint-rebase(7) +for a discussion of what kinds of behaviours should be be avoided because 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, a breakwater, -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 and C tags are added to the pre-existing commit message, -- 2.30.2