From fcff4f4b403b6dd53d6bc6b10d56baccd83dd144 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 13:55:28 +0100 Subject: git-debrebase(1): Warn against plain git rebase. Re #905004. Signed-off-by: Ian Jackson --- debian/changelog | 1 + git-debrebase.1.pod | 6 ++++++ 2 files changed, 7 insertions(+) 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 + =item git-debrebase status Analyses the current branch, -- cgit v1.2.3