chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cd6e230
)
dgit-maint-gbp(7): Don't try to use `dgit pull`
author
Sean Whitton
<spwhitton@spwhitton.name>
Sun, 30 Oct 2016 18:55:52 +0000
(11:55 -0700)
committer
Sean Whitton
<spwhitton@spwhitton.name>
Sun, 30 Oct 2016 18:55:52 +0000
(11:55 -0700)
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-gbp.7.pod
patch
|
blob
|
history
diff --git
a/dgit-maint-gbp.7.pod
b/dgit-maint-gbp.7.pod
index 53d147a045ff2f681413b3fa76054b77f1908a68..60fab5c9e619d84052fe87658ab0316a0138c667 100644
(file)
--- a/
dgit-maint-gbp.7.pod
+++ b/
dgit-maint-gbp.7.pod
@@
-121,14
+121,9
@@
performed with dgit.
=head1 INCORPORATING NMUS
=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<dgit pull> 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
=head1 SEE ALSO