X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-gbp.7.pod;h=134593cba887bf4de573a403996e384b59876313;hp=53d147a045ff2f681413b3fa76054b77f1908a68;hb=54f843c7e1644527e902e01eb401e98a02c44889;hpb=c9f58c9967e21caf226049851366edd00d581b1c diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod index 53d147a0..134593cb 100644 --- a/dgit-maint-gbp.7.pod +++ b/dgit-maint-gbp.7.pod @@ -22,10 +22,6 @@ Provide a better, more detailed git history to downstream dgit users, such as people using dgit to do an NMU (see dgit-nmu-simple(7) and dgit-user(7)). -=item - -Incorporate NMUs with a single command (see below). - =back Note that we assume a patches-unapplied repository: the upstream @@ -121,14 +117,9 @@ performed with dgit. =head1 INCORPORATING NMUS -=over 4 - - % dgit --gbp pull - -=back - -Alternatively, you can apply the NMU diff to your repository. The -next push will then require I<--overwrite>. +B can't yet incorporate NMUs into patches-unapplied gbp +branches. You can just apply the NMU diff the traditional way. The +next upload will require I<--overwrite>. =head1 SEE ALSO