path: root/dgit.7
diff options
authorSean Whitton <>2019-06-23 16:39:18 +0100
committerSean Whitton <>2019-06-23 16:39:18 +0100
commitfa917e493d6d4d30b0b824cc7ed4c02f5067eaab (patch)
treebdc1b4f0d969a294eb47e18bebc1777e7e65bbd9 /dgit.7
parent5eb8e042adf67fc5a7a25a1694b4df1dd50b44de (diff)
parent0594f61c6ea940a4d88bffb5384f775d5a7be194 (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) <>" [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 'dgit.7')
1 files changed, 2 insertions, 2 deletions
diff --git a/dgit.7 b/dgit.7
index d625e8f..8325c06 100644
--- a/dgit.7
+++ b/dgit.7
@@ -161,7 +161,7 @@ or to try to upload to it.
When using this facility, it is important to always specify the
same suites in the same order:
-dgit will not be make a coherent fast-forwarding history
+dgit will not make a coherent fast-forwarding history
view otherwise.
The history generated by this feature is not normally suitable
@@ -361,7 +361,7 @@ whose tree is identical to o+d/p in all upstream files.
In the error message,
is the first commit child-parent edge
-which cannot be sensibly be
+which cannot sensibly be
either ignored, or turned into a patch in debian/patches.
In this example, this is because
it itself changes files in debian/patches,