diff options
authorIan Jackson <>2016-10-30 23:55:52 +0000
committerIan Jackson <>2016-10-30 23:55:52 +0000
commit6e7c6b8b8305f162cea9e3da85c24b3f21888a1a (patch)
parentff4921f5cad01048c3c97a06c4f0cc6ed08b9ae4 (diff)
parentda9ec7d77f9c3f691d19f87b1117b505b0d58c5b (diff)
Merge remote-tracking branch 'spwhitton/wip.tutorials-new' into wip.tutorials
1 files changed, 5 insertions, 1 deletions
diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod
index 31da00b..5440759 100644
--- a/dgit-maint-native.7.pod
+++ b/dgit-maint-native.7.pod
@@ -15,12 +15,16 @@ We expect that your git history is fast-forwarding.
-You must be prepared to tolerate a small amount of
+You should be prepared to tolerate a small amount of
ugliness in your git history
in the form of merges which stitch
the dgit-generated archive view
into your maintainer history.
+This is to handle uploads that were not made with dgit,
+such as the uploads you made before switching to this workflow,
+or NMUs.
=head2 Benefits