From 99bfdd1686cd2870fce5a4d08d63b479fe4ef41f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 13:56:46 +0100 Subject: [PATCH] dgit-maint-debrebase(7): Warn more against plain git rebase. Specifically, - warn that pseudomerges must not be rebased over - warn and that git-rebase without a base should not be used - say to run gdr instead Closes:#905004. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ dgit-maint-debrebase.7.pod | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2e1497db..4cc32d27 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 685a6b25..0f2f8928 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 -- 2.30.2