summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-31 13:55:28 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-31 13:55:29 +0100
commitfcff4f4b403b6dd53d6bc6b10d56baccd83dd144 (patch)
treef48c38ea90dfb914333325ee7cbd91f0a6f7b89e
parent0057ec1d2d864bbd40a5fcc32a5edeeb2bc90b4e (diff)
git-debrebase(1): Warn against plain git rebase.
Re #905004. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog1
-rw-r--r--git-debrebase.1.pod6
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6f5e155..2e1497d 100644
--- 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(1): Warn against plain git rebase. (Re#905004.)
--
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index b15bf00..286d671 100644
--- 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.
+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,