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 <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 2e1497dbaea11f01642da648ff846d58b9f957e5..4cc32d27d348e0eeec9f829de8f197391c5848b3 100644 (file)
--- 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.)
     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 685a6b251b8622d5caf4ebcd69bcb5f451054c79..0f2f89288892722374aa392cab508300ae0e5824 100644 (file)
--- 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
 =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