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: do not crash on push of a new gdr package. Closes:#906784.
[dgit.git]
/
dgit-maint-debrebase.7.pod
diff --git
a/dgit-maint-debrebase.7.pod
b/dgit-maint-debrebase.7.pod
index 6223e8722179518a684299f2a38c7976b4e3ead1..0f2f89288892722374aa392cab508300ae0e5824 100644
(file)
--- a/
dgit-maint-debrebase.7.pod
+++ b/
dgit-maint-debrebase.7.pod
@@
-619,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