From b7f48e640bca6c2542c206c9bb7cdab182ba0a2c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 8 Nov 2018 00:47:09 +0000 Subject: [PATCH] dgit-maint-debrebase(7): Minor corrections to #903377 wording Do not suggest trying without --overwrite first, since if you were going to pass it anyway you may as well do so right away. And mention that git-debrebase will normally prompt you to say dgit --overwrite. Closes: #903377 Signed-off-by: Ian Jackson --- dgit-maint-debrebase.7.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index e3d557a7..f167928a 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -450,8 +450,8 @@ I<--new> if the package is new in the target suite. In some cases where you used B since the last upload, it is not possible for dgit to make your history fast-forwarding from the history on B. In such cases you -will require I<--overwrite>. Try pushing without this option first, -and then dgit will suggest using it if it is needed. +will have to pass I<--overwrite> to dgit. git-debrebase will normally +tell you if this is will be needed. Right before uploading, if you did not just already do so, you might want to have git-debrebase(1) shuffle your branch such that the Debian -- 2.30.2