summaryrefslogtreecommitdiff
path: root/dgit.7
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-10-20 10:21:58 -0700
committerSean Whitton <spwhitton@spwhitton.name>2018-10-20 10:21:58 -0700
commit4ea49240ddaa77bb4e290f9018727805ef87efc6 (patch)
treeecc5ef8ce55fa7cce83ebc9554edeb29920ea2cf /dgit.7
parentc1594eccda40a6a40bb2eb330a13578f330b3cc9 (diff)
parent16d99b2680f6c4e41c7740f542ca064455b4f5a4 (diff)
Merge tag 'debian/8.0' into stretch-bpo
dgit release 8.0 for unstable (sid) [dgit] [dgit distro=debian] # gpg: Signature made Sat 13 Oct 2018 04:01:49 PM MST # gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 # gpg: Can't check signature: No public key
Diffstat (limited to 'dgit.7')
-rw-r--r--dgit.74
1 files changed, 2 insertions, 2 deletions
diff --git a/dgit.7 b/dgit.7
index c150921..d625e8f 100644
--- a/dgit.7
+++ b/dgit.7
@@ -294,7 +294,7 @@ pushing. The only thing you need to know is that dgit build, sbuild,
etc., may make new commits on your HEAD. If you're not a quilt user
this commit won't contain any changes to files you care about.
-Simply commiting to source files
+Simply committing to source files
(whether in debian/ or not, but not to patches)
will result in a branch that dgit quilt-fixup can linearise.
Other kinds of changes,
@@ -447,7 +447,7 @@ As the maintainer you therefore have the following options:
Delete the files from your git branches,
and your Debian source packages,
and carry the deletion as a delta from upstream.
-(With `3.0 (quilt)' this means represeting the deletions as patches.
+(With `3.0 (quilt)' this means representing the deletions as patches.
You may need to pass --include-removal to dpkg-source --commit,
or pass corresponding options to other tools.)
This can make the Debian