changelog: start 9.14

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

diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod
index 29a712f360c6f0271941c300fec7243b49b62a9b..1988a317345d1a9ab006cb9233d6c62a53c653a1 100644 (file)
--- a/dgit-maint-gbp.7.pod
+++ b/dgit-maint-gbp.7.pod
@@ -31,6 +31,15 @@ normally used with patches-unapplied.
 
 =head1 GIT CONFIGURATION
 
+If you have configured an I<export-dir> in your gbp.conf, you should
+tell dgit about it:
+
+=over 4
+
+    % git config --global dgit.default.build-products-dir /home/spwhitton/build-area
+
+=back
+
 If you run
 
 =over 4
@@ -46,15 +55,15 @@ branch, never the dgit patches-applied branch.
 
 =head1 BUILDING
 
-You can perform builds like this:
+You can perform test builds like this:
 
 =over 4
 
-    % dgit [--allow-dirty] gbp-build [OPTIONS]
+    % dgit [--include-dirty] gbp-build [OPTIONS]
 
 =back
 
-where I<--allow-dirty> is needed for testing uncommitted changes, and
+where I<--include-dirty> is needed for testing uncommitted changes, and
 I<OPTIONS> are any further options to be passed on to
 gbp-buildpackage(1).
 
@@ -118,6 +127,9 @@ 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.)
 
+Alternatively, you can use git-debpush(1).  For the first upload you
+should pass the B<--gbp> quilt mode option (see git-debpush(1)).
+
 =head1 INCORPORATING NMUS
 
 B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp