path: root/dgit-maint-debrebase.7.pod
diff options
authorSean Whitton <>2019-06-23 16:39:18 +0100
committerSean Whitton <>2019-06-23 16:39:18 +0100
commitfa917e493d6d4d30b0b824cc7ed4c02f5067eaab (patch)
treebdc1b4f0d969a294eb47e18bebc1777e7e65bbd9 /dgit-maint-debrebase.7.pod
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-maint-debrebase.7.pod')
1 files changed, 3 insertions, 3 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index 4996e6a..b91ed16 100644
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -376,7 +376,7 @@ release:
Pass I<--stat> just to see the list of changed files, which is useful
-to determine whether there are any new or deleted files to may need
+to determine whether there are any new or deleted files that may need
accounting for in your copyright file.
If you obtained a tarball from upstream, you are ready to try a build.
@@ -451,7 +451,7 @@ In some cases where you used B<git debrebase convert-from-gbp> since
the last upload, it is not possible for dgit to make your history
fast-forwarding from the history on B<dgit-repos>. In such cases you
will have to pass I<--overwrite> to dgit. git-debrebase will normally
-tell you if this is will be needed.
+tell you if this will be needed.
Right before uploading, if you did not just already do so, you might
want to have git-debrebase(1) shuffle your branch such that the Debian
@@ -559,7 +559,7 @@ In the simplest case,
-If that fails, because your branch and the NMUers work represent
+If that fails, because your branch and the NMUers' work represent
divergent branches of development, you have a number of options. Here
we describe the two simplest.