From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 31 Jul 2018 12:56:46 +0000 (+0100)
Subject: dgit-maint-debrebase(7): Warn more against plain git rebase.
X-Git-Tag: archive/debian/6.3~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=99bfdd1686cd2870fce5a4d08d63b479fe4ef41f

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 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