X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=1c3e68128f0e4967e90d1bb9e219b43b075e57a9;hb=da6f19f4f54e84723e9d1435bcfd4f7db8e55986;hp=6168e144dc057e50c96c0c5c7f34747d81373f56;hpb=91fba49d952871ad085bbc6980cfb8c9c82f4fab;p=dgit.git 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