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 /dgit-maint-native.7.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 'dgit-maint-native.7.pod')
| -rw-r--r-- | dgit-maint-native.7.pod | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index ac57728..792be10 100644 --- a/dgit-maint-native.7.pod +++ b/dgit-maint-native.7.pod @@ -85,7 +85,7 @@ is fast forward from the dgit archive view. Alternatively, if this was the first ever dgit push of the package, you can avoid this merge commit by -passing C<--deliberately-not-fast-forward>. +passing C<--deliberately-not-fast-forward> instead of C<--overwrite>. This avoids introducing a new origin commit into your git history. |