chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-maint-merge(7): Missing -o
[dgit.git]
/
dgit-maint-gbp.7.pod
diff --git
a/dgit-maint-gbp.7.pod
b/dgit-maint-gbp.7.pod
index 320e06b5ed5b7d7a3dddab39c6c56eb457eca73d..134593cba887bf4de573a403996e384b59876313 100644
(file)
--- a/
dgit-maint-gbp.7.pod
+++ b/
dgit-maint-gbp.7.pod
@@
-22,12
+22,13
@@
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)).
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
=back
+Note that we assume a patches-unapplied repository: the upstream
+source committed to the git repository is unpatched.
+git-buildpackage(1) can work with patched-applied repositories, but is
+normally used with patches-unapplied.
+
=head1 GIT CONFIGURATION
If you run
=head1 GIT CONFIGURATION
If you run
@@
-116,14
+117,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