X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-debrebase.7.pod;fp=dgit-maint-debrebase.7.pod;h=e3d557a70026c36f6eec6c5fbfd439d531504fbc;hp=e5abe1773c604e4913f985468288283f91e37901;hb=737e066cf48706a00da9d65d0ee026fef0771a8b;hpb=e1026645bc6576b9b0f4c20e59b5f785c125aff2

diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index e5abe177..e3d557a7 100644
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -269,6 +269,11 @@ patches applied.  Use
 
 =back
 
+If you were not previously using dgit to upload your package (i.e. you
+were not using the workflow described in dgit-maint-gbp(7)), and you
+happen to have run B<dgit fetch sid> in this clone of the repository,
+you will need to pass I<--fdiverged> to this command.
+
 =item (C) There is a delta queue, and patches are applied.
 
 Use
@@ -442,6 +447,12 @@ cowbuilder>.
 Upload with B<dgit push> or B<dgit push-source>.  Remember to pass
 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.
+
 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
 delta queue appears right at the tip of the branch you will push: