chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: merge: test conflict: Break out no-wreckage
[dgit.git]
/
dgit-maint-debrebase.7.pod
diff --git
a/dgit-maint-debrebase.7.pod
b/dgit-maint-debrebase.7.pod
index 5ae921fae9cc4f53fd56803dd4b48e5f909fdcc7..0f2f89288892722374aa392cab508300ae0e5824 100644
(file)
--- a/
dgit-maint-debrebase.7.pod
+++ b/
dgit-maint-debrebase.7.pod
@@
-323,7
+323,7
@@
or if you have a working watch file
=over 4
=over 4
- % git debrebase new-upstream
-v0
1.2.3
+ % git debrebase new-upstream 1.2.3
=back
=back
@@
-406,7
+406,8
@@
is a single debrebase stitch.
=head1 BUILDING AND UPLOADING
You can use dpkg-buildpackage(1) for test builds. When you are ready
=head1 BUILDING AND UPLOADING
You can use dpkg-buildpackage(1) for test builds. When you are ready
-to build for an upload, use B<dgit sbuild>.
+to build for an upload, use B<dgit sbuild>, B<dgit pbuilder> or B<dgit
+cowbuilder>.
Upload with B<dgit push> or B<dgit push-source>. Remember to pass
I<--new> if the package is new in the target suite.
Upload with B<dgit push> or B<dgit push-source>. Remember to pass
I<--new> if the package is new in the target suite.
@@
-618,13
+619,18
@@
using git-rebase(1) directly. For example,
=over 4
=over 4
- % git debrebase
launder
+ % git debrebase
% git rebase -i HEAD~5 # there are 4 Debian patches
=back
If you take this approach, you should be very careful not to start the
% git rebase -i HEAD~5 # there are 4 Debian patches
=back
If you take this approach, you should be very careful not to start the
-rebase too early.
+rebase too early,
+including before the most recent pseudomerge.
+git-rebase without a base argument will often
+start the rebase too early,
+and should be avoided.
+Run git-debrebase instead.
=head1 SEE ALSO
=head1 SEE ALSO