|author||Ian Jackson <firstname.lastname@example.org>||2016-10-30 23:55:52 +0000|
|committer||Ian Jackson <email@example.com>||2016-10-30 23:55:52 +0000|
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
@@ -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,