git-debrebase(1): Warn against plain git rebase.

Re #905004.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 6f5e15575e60df1deade92d3fa8085483b9ef26e..2e1497dbaea11f01642da648ff846d58b9f957e5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ dgit (6.3~) unstable; urgency=medium
   * git-debrebase: Improve error message for convert-from-gbp
     upstream discrepancy.  Closes:#905078.
   * git-debrebase(5): Add ILLEGAL OPERATIONS section.  (Re#905004.)
   * git-debrebase: Improve error message for convert-from-gbp
     upstream discrepancy.  Closes:#905078.
   * git-debrebase(5): Add ILLEGAL OPERATIONS section.  (Re#905004.)

+  * git-debrebase(1): Warn against plain git rebase.  (Re#905004.)

 
  --
 
 
  --
 

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index b15bf00c1c88f233fa569f38a693e0cca4d5523d..286d6718dc13db423c63406b84db1166fd0983dc 100644 (file)
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -55,6 +55,12 @@ The options for git-rebase must either start with C<-i>,
 or be prececded by C<-->,
 to distinguish them from options for git-debrebase.
 
 or be prececded by C<-->,
 to distinguish them from options for git-debrebase.
 

+It is hazardous to use plain git-rebase on a git-debrebase branch,
+because git-rebase has a tendency to start the rebase
+too far back in history,
+and then drop important commits.
+Soo L<git-debrebase(5)/ILLEGAL OPERATIONS>
+

 =item git-debrebase status
 
 Analyses the current branch,
 =item git-debrebase status
 
 Analyses the current branch,