diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | dgit-maint-debrebase.7.pod | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 2e1497d..4cc32d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ dgit (6.3~) unstable; urgency=medium upstream discrepancy. Closes:#905078. * git-debrebase(5): Add ILLEGAL OPERATIONS section. (Re#905004.) * git-debrebase(1): Warn against plain git rebase. (Re#905004.) + * dgit-maint-debrebase(7): Warn more against plain git rebase. + Closes:#905004. -- diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 685a6b2..0f2f892 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -625,7 +625,12 @@ using git-rebase(1) directly. For example, =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 |