diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-06-23 16:39:18 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-06-23 16:39:18 +0100 |
| commit | fa917e493d6d4d30b0b824cc7ed4c02f5067eaab (patch) | |
| tree | bdc1b4f0d969a294eb47e18bebc1777e7e65bbd9 /git-debrebase.1.pod | |
| parent | 5eb8e042adf67fc5a7a25a1694b4df1dd50b44de (diff) | |
| parent | 0594f61c6ea940a4d88bffb5384f775d5a7be194 (diff) | |
Merge tag 'debian/8.5' into stretch-bpo
dgit release 8.5 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Mon 27 May 2019 12:24:02 AM BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Good signature from "Ian Jackson (new general purpose key) <ijackson@chiark.greenend.org.uk>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 559A E46C 2D6B 6D32 65E7 CBA1 E3E3 3923 48B5 0D39
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 00b664b..cbdf292 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 only be used with care and with a proper understanding of the underlying theory. Be sure to not accidentally treat the result as |