|author||Ian Jackson <email@example.com>||2018-11-08 00:47:09 +0000|
|committer||Ian Jackson <firstname.lastname@example.org>||2018-11-08 00:47:09 +0000|
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 <email@example.com>
1 files changed, 2 insertions, 2 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index e3d557a..f167928 100644
@@ -450,8 +450,8 @@ I<--new> if the package is new in the target suite.
In some cases where you used B<git debrebase convert-from-gbp> since
the last upload, it is not possible for dgit to make your history
fast-forwarding from the history on B<dgit-repos>. 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