summaryrefslogtreecommitdiff
path: root/dgit-maint-native.7.pod
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-10-30 16:54:35 -0700
committerSean Whitton <spwhitton@spwhitton.name>2016-10-30 16:54:35 -0700
commitda9ec7d77f9c3f691d19f87b1117b505b0d58c5b (patch)
tree07e8fe1dd33e5f2703c892badf3631154bd8a49a /dgit-maint-native.7.pod
parentbc1d578bd668ed7010be3ada52482a7c3e2bd7b6 (diff)
dgit-maint-native(7): Soften warning about ugliness
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit-maint-native.7.pod')
-rw-r--r--dgit-maint-native.7.pod6
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.
=item
-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.
+
=back
=head2 Benefits