X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-native.7.pod;fp=dgit-maint-native.7.pod;h=54407596dc905585d50f7a6d5a875d193f9ed3b3;hp=31da00bc8a417239cac07e2e77b616261d32bfdd;hb=da9ec7d77f9c3f691d19f87b1117b505b0d58c5b;hpb=bc1d578bd668ed7010be3ada52482a7c3e2bd7b6 diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index 31da00bc..54407596 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