dgit-maint-debrebase(7): avoiding merges

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index 68127b909de24338ff9ebc0971b69fa24b729c0d..0b75d58c43f72637fa026de2126b48600640366a 100644 (file)
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -55,8 +55,9 @@ This workflow is appropriate for packages where the Debian delta
 contains multiple pieces which interact, or which you don't expect to
 be able to upstream soon.  For packages with simple and/or short-lived
 Debian deltas, use of git-debrebase(1) might introduce unneeded
-complexity (for examples, see "BEHAVIOUR TO AVOID" below).  For such
-packages, consider the workflow described in dgit-maint-merge(7).
+complexity -- in particular, you cannot use B<git merge> to
+incorporate changes from other contributors.  For such packages,
+consider the workflow described in dgit-maint-merge(7).
 
 =head1 INITIAL DEBIANISATION
 
@@ -270,6 +271,25 @@ I<--deliberately-not-fast-forward> instead of I<--overwrite>.  This
 avoids introducing a new origin commit into your git history.  (This
 origin commit would represent the most recent non-dgit upload of the
 package, but this should already be represented in your git history.)
+=head1 GIT CONFIGURATION
+
+This workflow does not support using B<git merge> to merge divergent
+branches of development (see "OTHER MERGES" in git-debrebase(5)).  You
+should configure git such that B<git pull> does not try to merge:
+
+=over 4
+
+    % git config --local pull.rebase true
+
+=back
+
+Now when you pull work from other Debian contributors, git will rebase
+your work on top of theirs.
+
+If you use this repository for upstream development in addition to
+Debian packaging work, you may not want to set this global setting.
+Instead, see the B<branch.autoSetupRebase> and
+B<branch.E<lt>nameE<gt>.rebase> settings in git-config(5).
 
 =head1 IMPORTING NEW UPSTREAM RELEASES