dgit-maint-debrebase(7): account for case discussed in #903377

[dgit.git] / dgit-maint-debrebase.7.pod

diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index 675e2f3b097a31890e268a1c22a55033d55990ca..e3d557a70026c36f6eec6c5fbfd439d531504fbc 100644 (file)
--- 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:
@@ -627,25 +638,29 @@ package, but this should already be represented in your git history.)
 
 The git history made by git-debrebase can seem complicated.
 Here are some suggestions for helpful invocations of gitk and git.
-They can be adapted for other tools like tig, git log, etc.
+They can be adapted for other tools like tig(1), git-log(1), magit, etc.
 
-=over
+History of package in Debian, disregarding history from upstream:
 
-=item History of package in Debian (disregarding history from upstream):
+=over
 
     % gitk --first-parent
 
 In a laundered branch, the delta queue is at the top.
 
-=item History of the packaging (excluding the delta queue)
+=back
+
+History of the packaging, excluding the delta queue:
 
     % gitk :/debian :!/debian/patches
 
-=item Just the delta queue (ie, Debian's changes to upstream):
+Just the delta queue (i.e. Debian's changes to upstream):
 
     % gitk --first-parent -- :/ :!/debian
 
-=item Full history including old versions of the delta queue:
+Full history including old versions of the delta queue:
+
+=over
 
     % gitk --date-order
 
@@ -654,19 +669,24 @@ The "Declare fast forward" commits you see have an older history
 and a newer history as the other.
 --date-order makes gitk show the delta queues in the right order.
 
-=item Show complete diff since the last upload:
+=back
+
+Complete diff since the last upload:
+
+=over
 
     % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches
-(Includes changes to upstream files.)
 
-=item Interdiff of delta queue since last upload, if you really want that:
+This includes changes to upstream files.
+
+=back
+
+Interdiff of delta queue since last upload, if you really want it:
 
     % git debrebase make-patches
     % git diff dgit/dgit/sid..HEAD -- debian/patches
 
-=back
-
-Also of course there is
+And of course there is:
 
     % git debrebase status