Merge tag 'debian/8.0' into stretch-bpo

dgit release 8.0 for unstable (sid) [dgit]
[dgit distro=debian]

# gpg: Signature made Sat 13 Oct 2018 04:01:49 PM MST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

22 files changed, 3069 insertions, 1169 deletions

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 39c4598..458017d 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -48,13 +48,13 @@ BEGIN {
 		      upstreamversion
 		      stripepoch source_file_leafname is_orig_file_of_p_v
 		      server_branch server_ref
-                      stat_exists link_ltarget
+                      stat_exists link_ltarget rename_link_xf
 		      hashfile
                       fail failmsg ensuredir must_getcwd executable_on_path
                       waitstatusmsg failedcmd_waitstatus
 		      failedcmd_report_cmd failedcmd
                       runcmd shell_cmd cmdoutput cmdoutput_errok
-                      git_rev_parse git_cat_file
+                      git_rev_parse changedir_git_toplevel git_cat_file
 		      git_get_ref git_get_symref git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd
 		      git_check_unmodified
@@ -425,6 +425,70 @@ sub link_ltarget ($$) {
     $r or fail "(sym)link $old $new: $!\n";
 }
 
+sub rename_link_xf ($$$) {
+    # renames/moves or links/copies $src to $dst,
+    # even if $dst is on a different fs
+    # (May use the filename "$dst.tmp".);
+    # On success, returns true.
+    # On failure, returns false and sets
+    #    $@ to a reason message
+    #    $! to an errno value, or -1 if not known
+    # having possibly printed something about mv to stderr.
+    # Not safe to use without $keeporig if $dst might be a symlink
+    # to $src, as it might delete $src leaving $dst invalid.
+    my ($keeporig,$src,$dst) = @_;
+    if ($keeporig
+	? link   $src, $dst
+	: rename $src, $dst) {
+	return 1;
+    }
+    if ($! != EXDEV) {
+	$@ = "$!";
+	return 0;
+    }
+    if (!stat $src) {
+	$@ = f_ "stat source file: %S", $!;
+	return 0;
+    }
+    my @src_stat = (stat _)[0..1];
+
+    my @dst_stat;
+    if (stat $dst) {
+	@dst_stat = (stat _)[0..1];
+    } elsif ($! == ENOENT) {
+    } else {
+	$@ = f_ "stat destination file: %S", $!;
+	return 0;
+    }
+
+    if ("@src_stat" eq "@dst_stat") {
+	# (Symlinks to) the same file.  No need for a copy but
+	# we may need to delete the original.
+	printdebug "rename_link_xf $keeporig $src $dst EXDEV but same\n";
+    } else {
+	$!=0; $?=0;
+	my @cmd = (qw(cp --), $src, "$dst.tmp");
+	debugcmd '+',@cmd;
+	if (system @cmd) {
+	    failedcmd_report_cmd undef, @cmd;
+	    $@ = failedcmd_waitstatus();
+	    $! = -1;
+	    return 0;
+	}
+	if (!rename "$dst.tmp", $dst) {
+	    $@ = f_ "finally install file after cp: %S", $!;
+	    return 0;
+	}
+    }
+    if (!$keeporig) {
+	if (!unlink $src) {
+	    $@ = f_ "delete old file after cp: %S", $!;
+	    return 0;
+	}
+    }
+    return 1;
+}
+
 sub hashfile ($) {
     my ($fn) = @_;
     my $h = Digest::SHA->new(256);
@@ -436,6 +500,15 @@ sub git_rev_parse ($) {
     return cmdoutput qw(git rev-parse), "$_[0]~0";
 }
 
+sub changedir_git_toplevel () {
+    my $toplevel = cmdoutput qw(git rev-parse --show-toplevel);
+    length $toplevel or fail __ <<END;
+not in a git working tree?
+(git rev-parse --show-toplevel produced no output)
+END
+    chdir $toplevel or fail f_ "chdir toplevel %s: %s\n", $toplevel, $!;
+}
+
 sub git_cat_file ($;$) {
     my ($objname, $etype) = @_;
     # => ($type, $data) or ('missing', undef)
@@ -457,7 +530,7 @@ sub git_cat_file ($;$) {
 	debugcmd "GCF|", @cmd;
 	$gcf_pid = open2 $gcf_o, $gcf_i, @cmd or confess $!;
     }
-    printdebug "GCF>| ", $objname, "\n";
+    printdebug "GCF>| $objname\n";
     print $gcf_i $objname, "\n" or confess $!;
     my $x = <$gcf_o>;
     printdebug "GCF<| ", $x;
diff --git a/Makefile b/Makefile
index a0854a1..7d0c422 100644
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,11 @@ i18n i18n-update:
 	$(MAKE) -C po update
 	$(MAKE) -C po4a update
 
+i18n-commit:
+	set -e; x=$$(git status --porcelain); set -x; test "x$$x" = x
+	$(MAKE) i18n-update
+	git commit -a -m 'i18n-commit - autogenerated'
+
 check installcheck:
 
 clean distclean mostlyclean maintainer-clean:
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..88f1b87
--- /dev/null
+++ b/README.md
@@ -0,0 +1,42 @@
+dgit & git-debrebase
+====================
+
+ * `dgit` - git integration with the Debian archive
+ * `git-debrebase` - delta queue rebase tool for Debian packaging
+
+These tools are independent and can be used separately, but they work
+well together, and they share a source package and a test suite.
+
+dgit
+----
+
+dgit allows you to treat the Debian archive as if it were a git
+repository.  Conversely, it allows Debian to publish the source of its
+packages as git branches, in a format which is directly useable by
+ordinary people.
+
+Documentation: https://manpages.debian.org/testing/dgit
+
+git-debrebase
+-------------
+
+git-debrebase is a tool for representing in git, and manpulating,
+Debian packages based on upstream source code.
+
+Documentation: https://manpages.debian.org/testing/git-debrebase
+
+Contributing
+------------
+
+The source is maintained in git (of course).  The principal git
+branch can be found at either of these locations:
+
+ * https://salsa.debian.org/dgit-team/dgit
+ * https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/dgit.git/
+
+Merge requests on Salsa are welcome; as are code contributions via the
+Debian Bug Tracking System.  If you encounter a bug, please report it
+via the Debian BTS.
+
+The package is marked up for message and document translation.  
+See po/README which has Notes for Translators.
diff --git a/debian/changelog b/debian/changelog
index 9c847a3..ebb8d9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,69 @@
+dgit (8.0) unstable; urgency=medium
+
+  dgit - Behavioural change with compatibility implications:
+  * Check (with --clean=dpkg-source[-d], ie, by default) that rules
+    clean does not leave untracked files (ie, trip if it looks like
+    a `git add' may have been forgotten).  dgit will now fail in
+    some situations where previously it would have just carried on.
+  * Honour new clean modes --dpkg-source[-d],no-check aka -wdn / -wddn
+    which suppress this check.  (Whether the untracked files are
+    used or disregarded depends on --include-dirty.)
+  * Honour new .clean-mode-newer access config option, to allow git
+    configs to be compatible with both new and old dgits.
+    See relevant parts of dgit(1) for more information.
+
+  dgit - Improved behaviours:
+  * Better handling of cross-filesystem operations, including
+    build-products-dir on a different fs.  Closes:#910730.
+  * Change to git toplevel dir before starting.  Closes:#910724.
+  * Provide --clean=check,ignores aka -wci.
+  * Provide --clean=dpkg-source[-d],all-check aka -wda / -wdda.
+
+  dgit - Important bugfixes:
+  * Check that tree does not contain untracked files (depending on clean
+    mode) when building source using git branch rather than using working
+    tree.  In particular, honour --clean=check.  Closes:#910705.
+  * Also apply that new cleanliness check during build-source or
+    push-source etc. with --clean=dpkg-source; even though rules
+    clean was not run.  See above.  Again, -wdn / -wddn may be needed.
+  * dgit: Forbid source building with --include-dirty and non-.. bpd,
+    which can seriously malfunction.  Closes:#910725; see #910740.
+
+  dgit - Additional sanity checks:
+  * quilt linearisation: Stop at debian/source/format changes.
+  * quilt fixup: Cope if gdr analysis finds origin.  Closes:#910687.
+  * Add missing error check in single-debian-patch handling.
+  * Refuse to work if critical files have uncommitted changes.
+  * Reject all git config options containing newlines.
+  * Better error message for not in git tree.  (For git-debrebase too.)
+
+  dgit - Minor bugfixes:
+  * Fix spelling errors etc. in messages.
+  * Replace mention of alioth by salsa in a message.
+  * clean_tree: confess rather than die on unknown clean mode.
+  * Add missing \n to crash from git_cat_file.  (git-debrebase too.)
+
+  Documentation:
+  * dgit(1): Document that cleaning is sometimes not needed and
+    is therefore not done.
+  * README.md: Add this document for the benefit of Salsa.
+  * po/README: Mention -k10 threshold.
+  * po/README: Give a pointer to salsa; remind the translator to commit.
+  * dgit(1): Fix spelling errors.
+  * dgit(7): Fix spelling errors.
+  * dgit-sponsorship(7): Fix spelling error.
+
+  Consequential changes:
+  * Internal refactoring to support all these changes.
+  * Tests adjusted to correspond to, and somewhat test, these changes.
+  * Slight reorganisation to documentation of --clean=dpkg-source etc.
+
+  Build system:
+  * Makefile: Provide i18n-commit target.
+  * po/list-documents: Set translation threshold to 10%.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 13 Oct 2018 23:56:35 +0100
+
 dgit (7.0~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.
diff --git a/dgit b/dgit
index 4cc5684..e104838 100755
--- a/dgit
+++ b/dgit
@@ -101,7 +101,11 @@ our %forceopts = map { $_=>0 }
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
 our $suite_re = '[-+.0-9a-z]+';
-our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
+our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
+                         | git | git-ff
+                         | check (?: ,ignores )?
+                         | none
+                         )}x;
 
 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
 our $splitbraincache = 'dgit-intern/quilt-cache';
@@ -379,6 +383,10 @@ sub branch_is_gdr ($) {
 	    printdebug "branch_is_gdr  $walk ?-octopus NO\n";
 	    return 0;
 	}
+	if (!@parents) {
+	    printdebug "branch_is_gdr  $walk origin\n";
+	    return 0;
+	}
 	if ($get_patches->($walk) ne $tip_patches) {
 	    # Our parent added, removed, or edited patches, and wasn't
 	    # a gdr make-patches commit.  gdr make-patches probably
@@ -786,6 +794,9 @@ sub git_get_config ($) {
 	@$l==1 or badcfg
 	    f_ "multiple values for %s (in %s git config)", $c, $src
 	    if @$l > 1;
+	$l->[0] =~ m/\n/ and badcfg f_
+ "value for config option %s (in %s git config) contains newline(s)!",
+            $c, $src;
 	return $l->[0];
     }
     return undef;
@@ -2220,18 +2231,18 @@ sub generate_commits_from_dsc () {
 
 	printdebug "considering saving $f: ";
 
-	if (link $f, $upper_f) {
+	if (rename_link_xf 1, $f, $upper_f) {
 	    printdebug "linked.\n";
-	} elsif ((printdebug "($!) "),
+	} elsif ((printdebug "($@) "),
 		 $! != EEXIST) {
-	    fail f_ "saving %s: %s", "$buildproductsdir/$f", $!;
+	    fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
 	} elsif (!$refetched) {
 	    printdebug "no need.\n";
-	} elsif (link $f, "$upper_f,fetch") {
+	} elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
 	    printdebug "linked (using ...,fetch).\n";
-	} elsif ((printdebug "($!) "),
+	} elsif ((printdebug "($@) "),
 		 $! != EEXIST) {
-	    fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $!;
+	    fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
 	} else {
 	    printdebug "cannot.\n";
 	}
@@ -3813,12 +3824,25 @@ sub pull () {
 }
 
 sub check_not_dirty () {
-    foreach my $f (qw(local-options local-patch-header)) {
-	if (stat_exists "debian/source/$f") {
-	    fail f_ "git tree contains debian/source/%s", $f;
+    my @forbid = qw(local-options local-patch-header);
+    @forbid = map { "debian/source/$_" } @forbid;
+    foreach my $f (@forbid) {
+	if (stat_exists $f) {
+	    fail f_ "git tree contains %s", $f;
 	}
     }
 
+    my @cmd = (@git, qw(status -uall --ignored --porcelain));
+    push @cmd, qw(debian/source/format debian/source/options);
+    push @cmd, @forbid;
+
+    my $bad = cmdoutput @cmd;
+    if (length $bad) {
+	fail +(__
+ "you have uncommitted changes to critical files, cannot continue:\n").
+              $bad;
+    }
+
     return if $includedirty;
 
     git_check_unmodified();
@@ -4012,7 +4036,7 @@ END
 sub pseudomerge_make_commit ($$$$ $$) {
     my ($clogp, $dgitview, $archive_hash, $i_arch_v,
 	$msg_cmd, $msg_msg) = @_;
-    progress f_ "Declaring that HEAD inciudes all changes in %s...",
+    progress f_ "Declaring that HEAD includes all changes in %s...",
 	         $i_arch_v->[0];
 
     my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
@@ -4068,7 +4092,7 @@ sub splitbrain_pseudomerge ($$$$) {
     my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
 
     if (!defined $overwrite_version) {
-	progress __ "Checking that HEAD inciudes all changes in archive...";
+	progress __ "Checking that HEAD includes all changes in archive...";
     }
 
     return $dgitview if is_fast_fwd $archive_hash, $dgitview;
@@ -4519,11 +4543,11 @@ ENDT
     if ($sourceonlypolicy eq 'ok') {
     } elsif ($sourceonlypolicy eq 'always') {
 	forceable_fail [qw(uploading-binaries)],
-	    __ "uploading binaries, although distroy policy is source only"
+	    __ "uploading binaries, although distro policy is source only"
 	    if $hasdebs;
     } elsif ($sourceonlypolicy eq 'never') {
 	forceable_fail [qw(uploading-source-only)],
-	    __ "source-only upload, although distroy policy requires .debs"
+	    __ "source-only upload, although distro policy requires .debs"
 	    if !$hasdebs;
     } elsif ($sourceonlypolicy eq 'not-wholly-new') {
 	forceable_fail [qw(uploading-source-only)],
@@ -5499,7 +5523,8 @@ sub quiltify ($$$$) {
 	    printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
 
 	    my @cmd= (@git, qw(diff-tree -r --name-only),
-		      $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
+		      $p->{Commit},$c->{Commit},
+		      qw(-- debian/patches .pc debian/source/format));
 	    my $patchstackchange = cmdoutput @cmd;
 	    if (length $patchstackchange) {
 		$patchstackchange =~ s/\n/,/g;
@@ -5800,7 +5825,9 @@ sub quilt_fixup_singlepatch ($$$) {
     changedir "..";
     runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
     rename srcfn("$upstreamversion", "/debian/patches"), 
-           "work/debian/patches";
+	"work/debian/patches"
+	or $!==ENOENT
+	or confess "install d/patches: $!";
 
     changedir "work";
     commit_quilty_patch();
@@ -6176,34 +6203,71 @@ sub maybe_unapply_patches_again () {
 
 #----- other building -----
 
-our $clean_using_builder;
-# ^ tree is to be cleaned by dpkg-source's builtin idea that it should
-#   clean the tree before building (perhaps invoked indirectly by
-#   whatever we are using to run the build), rather than separately
-#   and explicitly by us.
+sub clean_tree_check_git ($$) {
+    my ($honour_ignores, $message) = @_;
+    my @cmd = (@git, qw(clean -dn));
+    push @cmd, qw(-x) unless $honour_ignores;
+    my $leftovers = cmdoutput @cmd;
+    if (length $leftovers) {
+	print STDERR $leftovers, "\n" or confess $!;
+	fail $message;
+    }
+}
+
+sub clean_tree_check_git_wd ($) {
+    my ($message) = @_;
+    return if $cleanmode =~ m{no-check};
+    return if $patches_applied_dirtily; # yuk
+    clean_tree_check_git +($cleanmode !~ m{all-check}),
+	                  (f_ <<END, $message);
+%s
+If this is just missing .gitignore entries, use a different clean
+mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them
+or --clean=git (-wg/-wgf) to use \`git clean' instead.
+END
+}
+
+sub clean_tree_check () {
+    # Not yet fully implemented.
+    # This function needs to not care about modified but tracked files.
+    # That was done by check_not_dirty, and by now we may have run
+    # the rules clean target which might modify tracked files (!)
+    if ($cleanmode =~ m{^check}) {
+	clean_tree_check_git +($cleanmode =~ m{ignores}), __
+ "tree contains uncommitted files and --clean=check specified";
+    } elsif ($cleanmode =~ m{^dpkg-source}) {
+	clean_tree_check_git_wd __
+ "tree contains uncommitted files (NB dgit didn't run rules clean)";
+    } elsif ($cleanmode =~ m{^git}) {
+	# If we were actually cleaning these files would be summarily
+	# deleted.  Since we're not, and not using the working tree
+	# anyway, we can just ignore them - nothing will use them.
+    } elsif ($cleanmode eq 'none') {
+    } else {
+	confess "$cleanmode ?";
+    }
+}
 
 sub clean_tree () {
-    return if $clean_using_builder;
-    if ($cleanmode eq 'dpkg-source') {
-	maybe_apply_patches_dirtily();
-	runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
-    } elsif ($cleanmode eq 'dpkg-source-d') {
+    # We always clean the tree ourselves, rather than leave it to the
+    # builder (dpkg-source, or soemthing which calls dpkg-source).
+    if ($cleanmode =~ m{^dpkg-source}) {
+	my @cmd = @dpkgbuildpackage;
+	push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
+	push @cmd, qw(-T clean);
 	maybe_apply_patches_dirtily();
-	runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
+	runcmd_ordryrun_local @cmd;
+	clean_tree_check_git_wd __
+ "tree contains uncommitted files (after running rules clean)";
     } elsif ($cleanmode eq 'git') {
 	runcmd_ordryrun_local @git, qw(clean -xdf);
     } elsif ($cleanmode eq 'git-ff') {
 	runcmd_ordryrun_local @git, qw(clean -xdff);
-    } elsif ($cleanmode eq 'check') {
-	my $leftovers = cmdoutput @git, qw(clean -xdn);
-	if (length $leftovers) {
-	    print STDERR $leftovers, "\n" or confess $!;
-	    fail __
- "tree contains uncommitted files and --clean=check specified";
-	}
+    } elsif ($cleanmode =~ m{^check}) {
+	clean_tree_check();
     } elsif ($cleanmode eq 'none') {
     } else {
-	die "$cleanmode ?";
+	confess "$cleanmode ?";
     }
 }
 
@@ -6239,9 +6303,18 @@ sub build_prep_early () {
 sub build_prep ($) {
     my ($wantsrc) = @_;
     build_prep_early();
-    # clean the tree if we're trying to include dirty changes in the
-    # source package, or we are running the builder in $maindir
-    clean_tree() if $includedirty || ($wantsrc & WANTSRC_BUILDER);
+    if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)) {
+	# Clean the tree because we're going to use the contents of
+	# $maindir.  (We trying to include dirty changes in the source
+	# package, or we are running the builder in $maindir.)
+	clean_tree();
+    } else {
+	# We don't actually need to do anything in $maindir, but we
+	# should do some kind of cleanliness check because (i) the
+	# user may have forgotten a `git add', and (ii) if the user
+	# said -wc we should still do the check.
+	clean_tree_check();
+    }
     build_maybe_quilt_fixup();
     if ($rmchanges) {
 	my $pat = changespat $version;
@@ -6512,9 +6585,7 @@ sub cmd_gbp_build {
 	build_source();
 	midbuild_checkchanges_vanilla $wantsrc;
     } else {
-	if (!$clean_using_builder) {
-	    push @cmd, '--git-cleaner=true';
-	}
+	push @cmd, '--git-cleaner=true';
     }
     maybe_unapply_patches_again();
     if ($wantsrc & WANTSRC_BUILDER) {
@@ -6562,6 +6633,24 @@ sub build_source {
         }
     } else {
         $leafdir = basename $maindir;
+
+	if ($buildproductsdir ne '..') {
+	    # Well, we are going to run dpkg-source -b which consumes
+	    # origs from .. and generates output there.  To make this
+	    # work when the bpd is not .. , we would have to (i) link
+	    # origs from bpd to .. , (ii) check for files that
+	    # dpkg-source -b would/might overwrite, and afterwards
+	    # (iii) move all the outputs back to the bpd (iv) except
+	    # for the origs which should be deleted from .. if they
+	    # weren't there beforehand.  And if there is an error and
+	    # we don't run to completion we would necessarily leave a
+	    # mess.  This is too much.  The real way to fix this
+	    # is for dpkg-source to have bpd support.
+	    confess unless $includedirty;
+	    fail __
+ "--include-dirty not supported with --build-products-dir, sorry";
+	}
+
         changedir '..';
     }
     runcmd_ordryrun_local @cmd, $leafdir;
@@ -6578,8 +6667,8 @@ sub build_source {
     my $mv = sub {
 	my ($why, $l) = @_;
         printdebug " renaming ($why) $l\n";
-        rename "$l", bpd_abs()."/$l"
-	    or fail f_ "put in place new built file (%s): %s", $l, $!;
+        rename_link_xf 0, "$l", bpd_abs()."/$l"
+	    or fail f_ "put in place new built file (%s): %s", $l, $@;
     };
     foreach my $l (split /\n/, getfield $dsc, 'Files') {
         $l =~ m/\S+$/ or next;
@@ -6808,7 +6897,7 @@ sub cmd_import_dsc {
 	    fail f_ <<END, $dsc_hash
 .dsc contains Dgit field referring to object %s
 Your git tree does not have that object.  Try `git fetch' from a
-plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
+plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.
 END
 	}
 	if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
@@ -6895,7 +6984,7 @@ END
 
     import_dsc_result $dstbranch, $newhash,
 	"dgit import-dsc: $info",
-	f_ "results are in in git ref %s", $dstbranch;
+	f_ "results are in git ref %s", $dstbranch;
 }
 
 sub pre_archive_api_query () {
@@ -7198,15 +7287,18 @@ sub parseopts () {
 		} elsif (s/^-wgf$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'git-ff';
-		} elsif (s/^-wd$//s) {
+		} elsif (s/^-wd(d?)([na]?)$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'dpkg-source';
-		} elsif (s/^-wdd$//s) {
-		    push @ropts, $&;
-		    $cleanmode = 'dpkg-source-d';
+		    $cleanmode .= '-d' if $1;
+		    $cleanmode .= ',no-check' if $2 eq 'n';
+		    $cleanmode .= ',all-check' if $2 eq 'a';
 		} elsif (s/^-wc$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'check';
+		} elsif (s/^-wci$//s) {
+		    push @ropts, $&;
+		    $cleanmode = 'check,ignores';
 		} elsif (s/^-c([^=]*)\=(.*)$//s) {
 		    push @git, '-c', $&;
 		    $gitcfgs{cmdline}{$1} = [ $2 ];
@@ -7245,7 +7337,7 @@ sub check_env_sanity () {
     chomp $@;
     fail f_ <<END, $@;
 On entry to dgit, %s
-This is a bug produced by something in in your execution environment.
+This is a bug produced by something in your execution environment.
 Giving up.
 END
 }
@@ -7314,11 +7406,14 @@ sub parseopts_late_defaults () {
 
     if (!defined $cleanmode) {
 	local $access_forpush;
-	$cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
+	$cleanmode = access_cfg('clean-mode-newer', 'RETURN-UNDEF');
+	$cleanmode = undef if $cleanmode && $cleanmode !~ m/^$cleanmode_re$/;
+
+	$cleanmode //= access_cfg('clean-mode', 'RETURN-UNDEF');
 	$cleanmode //= 'dpkg-source';
 
 	badcfg f_ "unknown clean-mode \`%s'", $cleanmode unless
-	    $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
+	    $cleanmode =~ m/$cleanmode_re/;
     }
 
     $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
@@ -7351,7 +7446,10 @@ $cmd =~ y/-/_/;
 my $pre_fn = ${*::}{"pre_$cmd"};
 $pre_fn->() if $pre_fn;
 
-record_maindir if $invoked_in_git_tree;
+if ($invoked_in_git_tree) {
+    changedir_git_toplevel();
+    record_maindir();
+}
 git_slurp_config();
 
 my $fn = ${*::}{"cmd_$cmd"};
diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod
index 3fbdac8..199903c 100644
--- a/dgit-sponsorship.7.pod
+++ b/dgit-sponsorship.7.pod
@@ -315,7 +315,7 @@ to dgit push for every successive upload.
 This disables a safety catch which would normally spot
 situations where changes are accidentally lost.
 When your sponsee is sending you source packages -
-perhaps multiple source pacakges with the same version number -
+perhaps multiple source packages with the same version number -
 these safety catches are inevitably ineffective.
 
 =head1 SEE ALSO
diff --git a/dgit.1 b/dgit.1
index 16c0a01..c3dd420 100644
--- a/dgit.1
+++ b/dgit.1
@@ -130,7 +130,7 @@ If you already have the suite branch,
 and want to merge your branch with updates from the archive,
 use dgit pull.
 
-dgit checkout will normally need to aceess the archive server,
+dgit checkout will normally need to access the archive server,
 to canonicalise the provided suite name.
 The exception is if you specify the canonical name,
 and the branch (or tracking branch) already exists.
@@ -146,7 +146,7 @@ commit.
 
 Tagging, signing and actually uploading should be left to dgit push.
 
-dgit's build operations access the the network,
+dgit's build operations access the network,
 to get the -v option right.
 See -v, below.
 .TP
@@ -424,7 +424,7 @@ If this is a problem
 consider --no-chase-dsc-distro
 or --force-import-dsc-with-dgit-field.
 
-There is only only sub-option:
+There is only one sub-option:
 
 .B --require-valid-signature
 causes dgit to insist that the signature on the .dsc is valid
@@ -436,7 +436,7 @@ If
 .I branch
 is prefixed with
 .B +
-then if it already exists, it will be simply ovewritten,
+then if it already exists, it will be simply overwritten,
 no matter its existing contents.
 If
 .I branch
@@ -469,7 +469,7 @@ It may not be useable in a browser.
 .TP
 .BI "dgit print-dpkg-source-ignores"
 Prints the -i and -I arguments which must be passed to dpkg-souce
-to cause it to exclude exactly the .git diredcory
+to cause it to exclude exactly the .git directory
 and nothing else.
 The separate arguments are unquoted, separated by spaces,
 and do not contain spaces.
@@ -538,7 +538,12 @@ This will delete all files which are not tracked by git.
 options other than dpkg-source
 are useful when the package's clean target is troublesome, or
 to avoid needing the build-dependencies.
-.TP
+
+dgit will only actually clean the tree if it needs to
+(because it needs to build the source package
+or binaries from your working tree).
+Otherwise any untracked files will be simply ignored.
+p.TP
 .BR --clean=git-ff " | " -wgf
 Use
 .BR "git clean -xdff"
@@ -548,11 +553,22 @@ git clean -xdf
 but it also removes any subdirectories containing different git
 trees (which only unusual packages are likely to create).
 .TP
-.BR --clean=check " | " -wc
+.BR --clean=check " | " --clean=check,ignores " | " -wc " | " -wci
 Merely check that the tree is clean (does not contain uncommitted
 files).
 Avoids running rules clean,
 and can avoid needing the build-dependencies.
+
+With
+.BR ,ignores
+or
+.BR -wci ,
+untracked files covered by .gitignore are tolerated,
+so only files which show up as
+.B ?
+in git status
+(ie, ones you maybe forgot to git add)
+are treated as a problem.
 .TP
 .BR --clean=none " | " -wn
 Do not clean the tree, nor check that it is clean.
@@ -562,21 +578,50 @@ If there are
 files which are not in git, or if the build creates such files, a
 subsequent dgit push will fail.
 .TP
-.BR --clean=dpkg-source " | " -wd
+.BR --clean=dpkg-source "[" -d "] | " -wd " | " -wdd
 Use dpkg-buildpackage to do the clean, so that the source package
 is cleaned by dpkg-source running the package's clean target.
-This is the default.
-Requires the package's build dependencies.
-.TP
-.BR --clean=dpkg-source-d " | " -wdd
-Use
-.B dpkg-buildpackage -d
-to do the clean,
-so that the source package
-is cleaned by dpkg-source running the package's clean target.
-The build-dependencies are not checked (due to
-.BR -d ),
+--clean=dpkg-source is the default.
+
+Without the extra
+.BR d ,
+requires the package's build dependencies.
+
+With
+.BR ... -d
+or
+.BR -wdd ,
+the build-dependencies are not checked
+(due to passing
+.BR -d
+to dpkg-buildpackage),
 which violates policy, but may work in practice.
+
+The rules clean target will only be run if it is needed:
+when dgit is going to build source or binary packages
+from your working tree,
+rather than from your git branch
+(for example because of --include-dirty
+or because the binary package build uses your working tree).
+
+In all cases,
+dgit will check that there are (after rules clean, if applicable) no
+untracked un-ignored files,
+in case these are files you forgot to git add.
+(Except that this check is not done
+for a `3.0 (quilt)' package
+when dgit has to apply patches, dirtily, to the working tree.)
+If your package does not have a good .gitignore
+you will probably need --clean=dpkg-source,no-check aka -wdn.
+.TP
+.BR --clean=dpkg-source "[" -d "]" ,no-check " | " -wdn " | " -wddn
+Like --clean=dpkg-source, but
+does not care about untracked un-ignored files.
+.TP
+.BR --clean=dpkg-source "[" -d "]" ,all-check " | " -wda " | " -wdda
+Like --clean=dpkg-source, but
+fails even on ignored untracked files.
+This could perhaps be used to detect bugs in your rules clean target.
 .TP
 .BR -N " | " --new
 The package is or may be new in this suite.  Without this, dgit will
@@ -708,7 +753,7 @@ And it is only effective with
 --quilt=unpatched.
 
 If ref does not start with refs/
-it is taken to to be a branch -
+it is taken to be a branch -
 i.e. refs/heads/ is prepended.
 
 .B --dgit-view-save
@@ -898,7 +943,7 @@ default, in
 When doing a build, delete any changes files matching
 .IB package _ version _*.changes
 before starting.  This ensures that
-dgit push (and dgit sbuild) will be able to unambigously
+dgit push (and dgit sbuild) will be able to unambiguously
 identify the relevant changes files from the most recent build, even
 if there have been previous builds with different tools or options.
 The default is not to remove, but
@@ -910,7 +955,7 @@ Note that \fBdgit push-source\fR will always find the right .changes,
 regardless of this option.
 .TP
 .BI --build-products-dir= directory
-Specifies where to find and create tarballs, binry packages,
+Specifies where to find and create tarballs, binary packages,
 source packages, .changes files, and so on.
 
 By default, dgit uses the parent directory
@@ -1219,7 +1264,13 @@ the default value used if there is no distro-specific setting.
 One of the values for the command line --clean= option; used if
 --clean is not specified.
 .TP
-.BR dgit-distro. \fIdistro\fR .quilt-mode
+.BR dgit-distro. \fIdistro\fR .clean-mode-newer
+Like .clean-mode,
+but ignored if the value does not make sense to this version of dgit.
+Setting both .clean-mode and .clean-mode-newer is useful
+to provide a single git config compatible with different dgit versions.
+.TP
+.BR dgit-distro. \fIdistro\fR .quilt-
 One of the values for the command line --quilt= option; used if
 --quilt is not specified.
 .TP
@@ -1366,7 +1417,7 @@ Default git user.email and user.name for new trees.  See
 .TP
 .BR gpg ", " dpkg- "..., " debsign ", " git ", " curl ", " dput ", " LWP::UserAgent
 and other subprograms and modules used by dgit are affected by various
-environment variables.  Consult the documentaton for those programs
+environment variables.  Consult the documentation for those programs
 for details.
 .SH BUGS
 There should be
diff --git a/dgit.7 b/dgit.7
index c150921..d625e8f 100644
--- a/dgit.7
+++ b/dgit.7
@@ -294,7 +294,7 @@ pushing.  The only thing you need to know is that dgit build, sbuild,
 etc., may make new commits on your HEAD.  If you're not a quilt user
 this commit won't contain any changes to files you care about.
 
-Simply commiting to source files
+Simply committing to source files
 (whether in debian/ or not, but not to patches)
 will result in a branch that dgit quilt-fixup can linearise.
 Other kinds of changes,
@@ -447,7 +447,7 @@ As the maintainer you therefore have the following options:
 Delete the files from your git branches,
 and your Debian source packages,
 and carry the deletion as a delta from upstream.
-(With `3.0 (quilt)' this means represeting the deletions as patches.
+(With `3.0 (quilt)' this means representing the deletions as patches.
 You may need to pass --include-removal to dpkg-source --commit,
 or pass corresponding options to other tools.)
 This can make the Debian
diff --git a/git-debrebase b/git-debrebase
index 79c8321..5e8a8bb 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -3031,8 +3031,7 @@ getoptions_main
 initdebug('git-debrebase ');
 enabledebug if $debuglevel;
 
-my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
-chdir $toplevel or fail f_ "chdir toplevel %s: %s\n", $toplevel, $!;
+changedir_git_toplevel();
 
 $rd = fresh_playground "$playprefix/misc";
 
diff --git a/po/README b/po/README
index 08959d4..365f2ff 100644
--- a/po/README
+++ b/po/README
@@ -22,6 +22,10 @@ testing the translation machinery, and since the source native
 language is en_GB, there is not much other need for the en_US
 translation.
 
+The threshold for generation of a translated documents has been set to
+10% (of each individual document).  The documents are quite sectional
+and I expect even a partially translated document to be useful.
+
 
 Translatation priorities
 ------------------------
@@ -121,3 +125,18 @@ In po4a/
                        translated and compiled manpages which can
                        be previewed with `man -l', and prints a
                        list of appropriate `man -l' commands.
+
+
+Committing and contributing your translation
+--------------------------------------------
+
+When you're done you'll need to commit the changes you have made to
+your language's po files.  If you started a new translation, don't
+forget to `git add' your new files !
+
+The easiest way to contribute your translation is probably for you to
+file a Merge Request on Sala:
+  https://salsa.debian.org/dgit-team/dgit
+
+Contributions via the Debian Bug Tracking System are also 
+welcome.
diff --git a/po/en_US.po b/po/en_US.po
index 3adb9c9..df78b26 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dgit ongoing\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 11:23+0000\n"
+"POT-Creation-Date: 2018-10-13 19:41+0000\n"
 "PO-Revision-Date: 2018-08-26 16:55+0100\n"
 "Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n"
 "Language-Team: dgit developrs <dgit@packages.debian.org>\n"
@@ -17,78 +17,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../dgit:236
+#: ../dgit:240
 #, perl-format
 msgid "%s: invalid configuration: %s\n"
 msgstr ""
 
-#: ../dgit:243
+#: ../dgit:247
 msgid "warning: overriding problem due to --force:\n"
 msgstr ""
 
-#: ../dgit:251
+#: ../dgit:255
 #, perl-format
 msgid "warning: skipping checks or functionality due to --force-%s\n"
 msgstr ""
 
-#: ../dgit:256
+#: ../dgit:260
 #, perl-format
 msgid "%s: package %s does not exist in suite %s\n"
 msgstr ""
 
-#: ../dgit:475
+#: ../dgit:483
 #, perl-format
 msgid "build host child %s"
 msgstr ""
 
-#: ../dgit:480 ../dgit:486
+#: ../dgit:488 ../dgit:494
 #, perl-format
 msgid "connection lost: %s"
 msgstr ""
 
-#: ../dgit:481
+#: ../dgit:489
 #, perl-format
 msgid "protocol violation; %s not expected"
 msgstr ""
 
-#: ../dgit:489
+#: ../dgit:497
 #, perl-format
 msgid "eof (reading %s)"
 msgstr ""
 
-#: ../dgit:496
+#: ../dgit:504
 msgid "protocol message"
 msgstr ""
 
-#: ../dgit:504
+#: ../dgit:512
 #, perl-format
 msgid "`%s'"
 msgstr ""
 
-#: ../dgit:525
+#: ../dgit:533
 msgid "bad byte count"
 msgstr ""
 
-#: ../dgit:528
+#: ../dgit:536
 msgid "data block"
 msgstr ""
 
-#: ../dgit:609
+#: ../dgit:617
 #, perl-format
 msgid "failed to fetch %s: %s"
 msgstr ""
 
-#: ../dgit:621
+#: ../dgit:629
 #, perl-format
 msgid "%s ok: %s"
 msgstr ""
 
-#: ../dgit:623
+#: ../dgit:631
 #, perl-format
 msgid "would be ok: %s (but dry run only)"
 msgstr ""
 
-#: ../dgit:648
+#: ../dgit:656
 msgid ""
 "main usages:\n"
 "  dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
@@ -109,136 +109,141 @@ msgid ""
 "  -c<name>=<value>    set git config option (used directly by dgit too)\n"
 msgstr ""
 
-#: ../dgit:667
+#: ../dgit:675
 msgid "Perhaps the upload is stuck in incoming.  Using the version from git.\n"
 msgstr ""
 
-#: ../dgit:671
+#: ../dgit:679
 #, perl-format
 msgid ""
 "%s: %s\n"
 "%s"
 msgstr ""
 
-#: ../dgit:676
+#: ../dgit:684
 msgid "too few arguments"
 msgstr ""
 
-#: ../dgit:787
+#: ../dgit:795
 #, perl-format
 msgid "multiple values for %s (in %s git config)"
 msgstr ""
 
-#: ../dgit:807
+#: ../dgit:798
+#, perl-format
+msgid "value for config option %s (in %s git config) contains newline(s)!"
+msgstr ""
+
+#: ../dgit:818
 #, perl-format
 msgid ""
 "need value for one of: %s\n"
 "%s: distro or suite appears not to be (properly) supported"
 msgstr ""
 
-#: ../dgit:848
+#: ../dgit:859
 #, perl-format
 msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
 msgstr ""
 
-#: ../dgit:863
+#: ../dgit:874
 #, perl-format
 msgid "backports-quirk needs % or ( )"
 msgstr ""
 
-#: ../dgit:879
+#: ../dgit:890
 #, perl-format
 msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
 msgstr ""
 
-#: ../dgit:899
+#: ../dgit:910
 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
 msgstr ""
 
-#: ../dgit:908 ../Debian/Dgit.pm:201
+#: ../dgit:919 ../git-debrebase:1586 ../Debian/Dgit.pm:201
 msgid "internal error"
 msgstr ""
 
-#: ../dgit:910
+#: ../dgit:921
 msgid "pushing but distro is configured readonly"
 msgstr ""
 
-#: ../dgit:914
+#: ../dgit:925
 msgid ""
 "Push failed, before we got started.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 
-#: ../dgit:1079
+#: ../dgit:1090
 msgid "this operation does not support multiple comma-separated suites"
 msgstr ""
 
-#: ../dgit:1125
+#: ../dgit:1136
 #, perl-format
 msgid ""
 "config requested specific TLS key but do not know how to get curl to use "
 "exactly that EE key (%s)"
 msgstr ""
 
-#: ../dgit:1146
+#: ../dgit:1157
 msgid "ftpmasterapi archive query method takes no data part"
 msgstr ""
 
-#: ../dgit:1154
+#: ../dgit:1165
 msgid "curl failed to print 3-digit HTTP code"
 msgstr ""
 
-#: ../dgit:1158
+#: ../dgit:1169
 #, perl-format
 msgid "fetch of %s gave HTTP code %s"
 msgstr ""
 
-#: ../dgit:1174
+#: ../dgit:1185
 #, perl-format
 msgid "unknown suite %s, maybe -d would help"
 msgstr ""
 
-#: ../dgit:1178
+#: ../dgit:1189
 #, perl-format
 msgid "multiple matches for suite %s\n"
 msgstr ""
 
-#: ../dgit:1180
+#: ../dgit:1191
 #, perl-format
 msgid "suite %s info has no codename\n"
 msgstr ""
 
-#: ../dgit:1182
+#: ../dgit:1193
 #, perl-format
 msgid "suite %s maps to bad codename\n"
 msgstr ""
 
-#: ../dgit:1184 ../dgit:1209
+#: ../dgit:1195 ../dgit:1220
 msgid "bad ftpmaster api response: "
 msgstr ""
 
-#: ../dgit:1198
+#: ../dgit:1209
 #, perl-format
 msgid "bad version: %s\n"
 msgstr ""
 
-#: ../dgit:1200
+#: ../dgit:1211
 msgid "bad component"
 msgstr ""
 
-#: ../dgit:1203
+#: ../dgit:1214
 msgid "bad filename"
 msgstr ""
 
-#: ../dgit:1205
+#: ../dgit:1216
 msgid "bad sha256sum"
 msgstr ""
 
-#: ../dgit:1256
+#: ../dgit:1267
 msgid "aptget archive query method takes no data part"
 msgstr ""
 
-#: ../dgit:1340
+#: ../dgit:1351
 #, perl-format
 msgid ""
 "apt seemed to not to update dgit's cached Release files for %s.\n"
@@ -246,163 +251,163 @@ msgid ""
 " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
 msgstr ""
 
-#: ../dgit:1362
+#: ../dgit:1373
 #, perl-format
 msgid "Release file (%s) specifies intolerable %s"
 msgstr ""
 
-#: ../dgit:1390
+#: ../dgit:1401
 msgid "apt-get source did not produce a .dsc"
 msgstr ""
 
-#: ../dgit:1391
+#: ../dgit:1402
 #, perl-format
 msgid "apt-get source produced several .dscs (%s)"
 msgstr ""
 
-#: ../dgit:1496
+#: ../dgit:1507
 #, perl-format
 msgid ""
 "unable to canonicalise suite using package %s which does not appear to exist "
 "in suite %s; --existing-package may help"
 msgstr ""
 
-#: ../dgit:1687
+#: ../dgit:1698
 #, perl-format
 msgid "cannot operate on %s suite"
 msgstr ""
 
-#: ../dgit:1690
+#: ../dgit:1701
 #, perl-format
 msgid "canonical suite name for %s is %s"
 msgstr ""
 
-#: ../dgit:1692
+#: ../dgit:1703
 #, perl-format
 msgid "canonical suite name is %s"
 msgstr ""
 
-#: ../dgit:1712
+#: ../dgit:1723
 #, perl-format
 msgid "%s has hash %s but archive told us to expect %s"
 msgstr ""
 
-#: ../dgit:1718
+#: ../dgit:1729
 #, perl-format
 msgid "unsupported source format %s, sorry"
 msgstr ""
 
-#: ../dgit:1745
+#: ../dgit:1756
 #, perl-format
 msgid "diverting to %s (using config for %s)"
 msgstr ""
 
-#: ../dgit:1762
+#: ../dgit:1773
 msgid "unexpected results from git check query - "
 msgstr ""
 
-#: ../dgit:1777
+#: ../dgit:1788
 #, perl-format
 msgid "unknown git-check `%s'"
 msgstr ""
 
-#: ../dgit:1792
+#: ../dgit:1803
 #, perl-format
 msgid "unknown git-create `%s'"
 msgstr ""
 
-#: ../dgit:1829
+#: ../dgit:1840
 #, perl-format
 msgid "%s: warning: removing from %s: %s\n"
 msgstr ""
 
-#: ../dgit:1875
+#: ../dgit:1886
 #, perl-format
 msgid "could not parse .dsc %s line `%s'"
 msgstr ""
 
-#: ../dgit:1886
+#: ../dgit:1897
 #, perl-format
 msgid "missing any supported Checksums-* or Files field in %s"
 msgstr ""
 
-#: ../dgit:1932
+#: ../dgit:1943
 #, perl-format
 msgid "hash or size of %s varies in %s fields (between: %s)"
 msgstr ""
 
-#: ../dgit:1941
+#: ../dgit:1952
 #, perl-format
 msgid "file list in %s varies between hash fields!"
 msgstr ""
 
-#: ../dgit:1945
+#: ../dgit:1956
 #, perl-format
 msgid "%s has no files list field(s)"
 msgstr ""
 
-#: ../dgit:1951
+#: ../dgit:1962
 #, perl-format
 msgid "no file appears in all file lists (looked in: %s)"
 msgstr ""
 
-#: ../dgit:1991
+#: ../dgit:2002
 #, perl-format
 msgid "purportedly source-only changes polluted by %s\n"
 msgstr ""
 
-#: ../dgit:2004
+#: ../dgit:2015
 msgid "cannot find section/priority from .changes Files field"
 msgstr ""
 
-#: ../dgit:2017
+#: ../dgit:2028
 msgid ""
 "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
 msgstr ""
 
-#: ../dgit:2033
+#: ../dgit:2044
 #, perl-format
 msgid ".dsc %s missing entry for %s"
 msgstr ""
 
-#: ../dgit:2038
+#: ../dgit:2049
 #, perl-format
 msgid "%s: %s (archive) != %s (local .dsc)"
 msgstr ""
 
-#: ../dgit:2046
+#: ../dgit:2057
 #, perl-format
 msgid "archive %s: %s"
 msgstr ""
 
-#: ../dgit:2053
+#: ../dgit:2064
 #, perl-format
 msgid "archive contains %s with different checksum"
 msgstr ""
 
-#: ../dgit:2081
+#: ../dgit:2092
 #, perl-format
 msgid "edited .changes for archive .orig contents: %s %s"
 msgstr ""
 
-#: ../dgit:2089
+#: ../dgit:2100
 #, perl-format
 msgid "[new .changes left in %s]"
 msgstr ""
 
-#: ../dgit:2092
+#: ../dgit:2103
 #, perl-format
 msgid "%s already has appropriate .orig(s) (if any)"
 msgstr ""
 
-#: ../dgit:2116
+#: ../dgit:2127
 #, perl-format
 msgid ""
 "unexpected commit author line format `%s' (was generated from changelog "
 "Maintainer field)"
 msgstr ""
 
-#: ../dgit:2139
+#: ../dgit:2150
 msgid ""
 "\n"
 "Unfortunately, this source package uses a feature of dpkg-source where\n"
@@ -417,67 +422,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:2151
+#: ../dgit:2162
 #, perl-format
 msgid ""
 "Found active distro-specific series file for %s (%s): %s, cannot continue"
 msgstr ""
 
-#: ../dgit:2182
+#: ../dgit:2193
 msgid "Dpkg::Vendor `current vendor'"
 msgstr ""
 
-#: ../dgit:2184
+#: ../dgit:2195
 msgid "(base) distro being accessed"
 msgstr ""
 
-#: ../dgit:2186
+#: ../dgit:2197
 msgid "(nominal) distro being accessed"
 msgstr ""
 
-#: ../dgit:2207 ../dgit:2212
+#: ../dgit:2218 ../dgit:2223
 #, perl-format
 msgid "accessing %s: %s"
 msgstr ""
 
-#: ../dgit:2227 ../dgit:2234
+#: ../dgit:2238 ../dgit:2245
 #, perl-format
 msgid "saving %s: %s"
 msgstr ""
 
-#: ../dgit:2300
+#: ../dgit:2311
 #, perl-format
 msgid "dgit (child): exec %s: %s"
 msgstr ""
 
-#: ../dgit:2364 ../dgit:5862
+#: ../dgit:2375 ../dgit:5892
 msgid "source package"
 msgstr ""
 
-#: ../dgit:2382
+#: ../dgit:2393
 msgid "package changelog"
 msgstr ""
 
-#: ../dgit:2422
+#: ../dgit:2433
 msgid "package changelog has no entries!"
 msgstr ""
 
-#: ../dgit:2441
+#: ../dgit:2452
 #, perl-format
 msgid "Import %s"
 msgstr ""
 
-#: ../dgit:2522
+#: ../dgit:2533
 #, perl-format
 msgid "%s: trying slow absurd-git-apply..."
 msgstr ""
 
-#: ../dgit:2541
+#: ../dgit:2552
 #, perl-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: ../dgit:2550
+#: ../dgit:2561
 #, perl-format
 msgid ""
 "gbp-pq import and dpkg-source disagree!\n"
@@ -486,21 +491,21 @@ msgid ""
 " dpkg-source --before-build gave tree %s\n"
 msgstr ""
 
-#: ../dgit:2565
+#: ../dgit:2576
 #, perl-format
 msgid "synthesised git commit from .dsc %s"
 msgstr ""
 
-#: ../dgit:2569
+#: ../dgit:2580
 msgid "Import of source package"
 msgstr ""
 
-#: ../dgit:2582
+#: ../dgit:2593
 #, perl-format
 msgid "Record %s (%s) in archive suite %s\n"
 msgstr ""
 
-#: ../dgit:2586
+#: ../dgit:2597
 #, perl-format
 msgid ""
 "\n"
@@ -509,51 +514,51 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:2628
+#: ../dgit:2639
 #, perl-format
 msgid "using existing %s"
 msgstr ""
 
-#: ../dgit:2632
+#: ../dgit:2643
 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
 "file?)"
 msgstr ""
 
-#: ../dgit:2636
+#: ../dgit:2647
 #, perl-format
 msgid "need to fetch correct version of %s"
 msgstr ""
 
-#: ../dgit:2652
+#: ../dgit:2663
 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
 msgstr ""
 
-#: ../dgit:2747
+#: ../dgit:2758
 msgid "too many iterations trying to get sane fetch!"
 msgstr ""
 
-#: ../dgit:2762
+#: ../dgit:2773
 #, perl-format
 msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
 msgstr ""
 
-#: ../dgit:2806
+#: ../dgit:2817
 #, perl-format
 msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
 msgstr ""
 
-#: ../dgit:2821
+#: ../dgit:2832
 msgid ""
 "--dry-run specified but we actually wanted the results of git fetch,\n"
 "so this is not going to work.  Try running dgit fetch first,\n"
 "or using --damp-run instead of --dry-run.\n"
 msgstr ""
 
-#: ../dgit:2826
+#: ../dgit:2837
 #, perl-format
 msgid ""
 "warning: git ls-remote suggests we want %s\n"
@@ -563,49 +568,49 @@ msgid ""
 "warning:  Will try again...\n"
 msgstr ""
 
-#: ../dgit:2893
+#: ../dgit:2904
 #, perl-format
 msgid "Not updating %s from %s to %s.\n"
 msgstr ""
 
-#: ../dgit:2942
+#: ../dgit:2953
 #, perl-format
 msgid "%s: NO git hash"
 msgstr ""
 
-#: ../dgit:2946
+#: ../dgit:2957
 #, perl-format
 msgid "%s: specified git info (%s)"
 msgstr ""
 
-#: ../dgit:2953
+#: ../dgit:2964
 #, perl-format
 msgid "%s: specified git hash"
 msgstr ""
 
-#: ../dgit:2955
+#: ../dgit:2966
 #, perl-format
 msgid "%s: invalid Dgit info"
 msgstr ""
 
-#: ../dgit:2977
+#: ../dgit:2988
 #, perl-format
 msgid "not chasing .dsc distro %s: not fetching %s"
 msgstr ""
 
-#: ../dgit:2982
+#: ../dgit:2993
 #, perl-format
 msgid ".dsc names distro %s: fetching %s"
 msgstr ""
 
-#: ../dgit:2987
+#: ../dgit:2998
 #, perl-format
 msgid ""
 ".dsc Dgit metadata is in context of distro %s\n"
 "for which we have no configured url and .dsc provides no hint\n"
 msgstr ""
 
-#: ../dgit:2997
+#: ../dgit:3008
 #, perl-format
 msgid ""
 ".dsc Dgit metadata is in context of distro %s\n"
@@ -614,54 +619,54 @@ msgid ""
 "(can be overridden by config - consult documentation)\n"
 msgstr ""
 
-#: ../dgit:3017
+#: ../dgit:3028
 msgid "rewrite map"
 msgstr ""
 
-#: ../dgit:3024
+#: ../dgit:3035
 msgid "server's git history rewrite map contains a relevant entry!"
 msgstr ""
 
-#: ../dgit:3028
+#: ../dgit:3039
 msgid "using rewritten git hash in place of .dsc value"
 msgstr ""
 
-#: ../dgit:3030
+#: ../dgit:3041
 msgid "server data says .dsc hash is to be disregarded"
 msgstr ""
 
-#: ../dgit:3037
+#: ../dgit:3048
 msgid "additional commits"
 msgstr ""
 
-#: ../dgit:3040
+#: ../dgit:3051
 #, perl-format
 msgid ""
 ".dsc Dgit metadata requires commit %s\n"
 "but we could not obtain that object anywhere.\n"
 msgstr ""
 
-#: ../dgit:3064
+#: ../dgit:3075
 msgid "last upload to archive"
 msgstr ""
 
-#: ../dgit:3068
+#: ../dgit:3079
 msgid "no version available from the archive"
 msgstr ""
 
-#: ../dgit:3151
+#: ../dgit:3162
 msgid "dgit suite branch on dgit git server"
 msgstr ""
 
-#: ../dgit:3158
+#: ../dgit:3169
 msgid "dgit client's archive history view"
 msgstr ""
 
-#: ../dgit:3163
+#: ../dgit:3174
 msgid "Dgit field in .dsc from archive"
 msgstr ""
 
-#: ../dgit:3191
+#: ../dgit:3202
 #, perl-format
 msgid ""
 "\n"
@@ -671,15 +676,15 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:3204
+#: ../dgit:3215
 msgid "archive .dsc names newer git commit"
 msgstr ""
 
-#: ../dgit:3207
+#: ../dgit:3218
 msgid "archive .dsc names other git commit, fixing up"
 msgstr ""
 
-#: ../dgit:3228
+#: ../dgit:3239
 #, perl-format
 msgid ""
 "\n"
@@ -687,7 +692,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:3237
+#: ../dgit:3248
 #, perl-format
 msgid ""
 "\n"
@@ -697,7 +702,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3322
+#: ../dgit:3333
 #, perl-format
 msgid ""
 "Record %s (%s) in archive suite %s\n"
@@ -705,19 +710,19 @@ msgid ""
 "Record that\n"
 msgstr ""
 
-#: ../dgit:3335
+#: ../dgit:3346
 msgid "should be treated as descended from\n"
 msgstr ""
 
-#: ../dgit:3353
+#: ../dgit:3364
 msgid "dgit repo server tip (last push)"
 msgstr ""
 
-#: ../dgit:3355
+#: ../dgit:3366
 msgid "local tracking tip (last fetch)"
 msgstr ""
 
-#: ../dgit:3366
+#: ../dgit:3377
 #, perl-format
 msgid ""
 "\n"
@@ -727,30 +732,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3381
+#: ../dgit:3392
 msgid "fetched source tree"
 msgstr ""
 
-#: ../dgit:3417
+#: ../dgit:3428
 msgid "debian/changelog merge driver"
 msgstr ""
 
-#: ../dgit:3482
+#: ../dgit:3493
 msgid ""
 "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
 " not doing further gitattributes setup\n"
 msgstr ""
 
-#: ../dgit:3496
+#: ../dgit:3507
 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
 msgstr ""
 
-#: ../dgit:3511
+#: ../dgit:3522
 #, perl-format
 msgid "install %s: %s"
 msgstr ""
 
-#: ../dgit:3538
+#: ../dgit:3549
 #, perl-format
 msgid ""
 "dgit: warning: %s contains .gitattributes\n"
@@ -758,30 +763,30 @@ msgid ""
 "tree.\n"
 msgstr ""
 
-#: ../dgit:3560
+#: ../dgit:3571
 #, perl-format
 msgid "fetching %s..."
 msgstr ""
 
-#: ../dgit:3568
+#: ../dgit:3579
 #, perl-format
 msgid "failed to obtain %s: %s"
 msgstr ""
 
-#: ../dgit:3607
+#: ../dgit:3618
 #, perl-format
 msgid "package %s missing in (base suite) %s"
 msgstr ""
 
-#: ../dgit:3639
+#: ../dgit:3650
 msgid "local combined tracking branch"
 msgstr ""
 
-#: ../dgit:3641
+#: ../dgit:3652
 msgid "archive seems to have rewound: local tracking branch is ahead!"
 msgstr ""
 
-#: ../dgit:3680
+#: ../dgit:3691
 #, perl-format
 msgid ""
 "Combine archive branches %s [dgit]\n"
@@ -789,7 +794,7 @@ msgid ""
 "Input branches:\n"
 msgstr ""
 
-#: ../dgit:3694
+#: ../dgit:3705
 msgid ""
 "\n"
 "Key\n"
@@ -798,244 +803,248 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3709
+#: ../dgit:3720
 #, perl-format
 msgid "calculated combined tracking suite %s"
 msgstr ""
 
-#: ../dgit:3727
+#: ../dgit:3738
 #, perl-format
 msgid "ready for work in %s"
 msgstr ""
 
-#: ../dgit:3735
+#: ../dgit:3746
 msgid "dry run makes no sense with clone"
 msgstr ""
 
-#: ../dgit:3752
+#: ../dgit:3763
 #, perl-format
 msgid "create `%s': %s"
 msgstr ""
 
-#: ../dgit:3763
+#: ../dgit:3774
 msgid "fetching existing git history"
 msgstr ""
 
-#: ../dgit:3767
+#: ../dgit:3778
 msgid "starting new git history"
 msgstr ""
 
-#: ../dgit:3793
+#: ../dgit:3804
 #, perl-format
 msgid ""
 "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n"
 " Your vcs-git remote url may be out of date.  Use dgit update-vcs-git ?\n"
 msgstr ""
 
-#: ../dgit:3798
+#: ../dgit:3809
 #, perl-format
 msgid "fetched into %s"
 msgstr ""
 
-#: ../dgit:3810
+#: ../dgit:3821
 #, perl-format
 msgid "Merge from %s [dgit]"
 msgstr ""
 
-#: ../dgit:3812
+#: ../dgit:3823
 #, perl-format
 msgid "fetched to %s and merged into HEAD"
 msgstr ""
 
-#: ../dgit:3818
+#: ../dgit:3831
 #, perl-format
-msgid "git tree contains debian/source/%s"
+msgid "git tree contains %s"
 msgstr ""
 
-#: ../dgit:3837
+#: ../dgit:3842
+msgid "you have uncommitted changes to critical files, cannot continue:\n"
+msgstr ""
+
+#: ../dgit:3861
 #, perl-format
 msgid ""
 "quilt fixup required but quilt mode is `nofix'\n"
 "HEAD commit%s differs from tree implied by debian/patches%s"
 msgstr ""
 
-#: ../dgit:3854
+#: ../dgit:3878
 msgid "nothing quilty to commit, ok."
 msgstr ""
 
-#: ../dgit:3857
+#: ../dgit:3881
 msgid " (wanted to commit patch update)"
 msgstr ""
 
-#: ../dgit:3861
+#: ../dgit:3885
 msgid ""
 "Commit Debian 3.0 (quilt) metadata\n"
 "\n"
 msgstr ""
 
-#: ../dgit:3904
+#: ../dgit:3928
 #, perl-format
 msgid ""
 "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
 msgstr ""
 
-#: ../dgit:3909
+#: ../dgit:3933
 #, perl-format
 msgid "Format `%s', need to check/update patch stack"
 msgstr ""
 
-#: ../dgit:3919
+#: ../dgit:3943
 #, perl-format
 msgid "commit id %s"
 msgstr ""
 
-#: ../dgit:3925
+#: ../dgit:3949
 #, perl-format
 msgid "and left in %s"
 msgstr ""
 
-#: ../dgit:3951
+#: ../dgit:3975
 #, perl-format
 msgid "Wanted tag %s (%s) on dgit server, but not found\n"
 msgstr ""
 
-#: ../dgit:3954
+#: ../dgit:3978
 #, perl-format
 msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
 msgstr ""
 
-#: ../dgit:3962
+#: ../dgit:3986
 #, perl-format
 msgid "%s (%s) .. %s (%s) is not fast forward\n"
 msgstr ""
 
-#: ../dgit:3971
+#: ../dgit:3995
 msgid "version currently in archive"
 msgstr ""
 
-#: ../dgit:3980
+#: ../dgit:4004
 #, perl-format
 msgid "Checking package changelog for archive version %s ..."
 msgstr ""
 
-#: ../dgit:3988
+#: ../dgit:4012
 #, perl-format
 msgid "%s field from dpkg-parsechangelog %s"
 msgstr ""
 
-#: ../dgit:3998
+#: ../dgit:4022
 #, perl-format
 msgid "Perhaps debian/changelog does not mention %s ?"
 msgstr ""
 
-#: ../dgit:4001
+#: ../dgit:4025
 #, perl-format
 msgid ""
 "%s is %s\n"
 "Your tree seems to based on earlier (not uploaded) %s.\n"
 msgstr ""
 
-#: ../dgit:4015
+#: ../dgit:4039
 #, perl-format
-msgid "Declaring that HEAD inciudes all changes in %s..."
+msgid "Declaring that HEAD includes all changes in %s..."
 msgstr ""
 
-#: ../dgit:4071
-msgid "Checking that HEAD inciudes all changes in archive..."
+#: ../dgit:4095
+msgid "Checking that HEAD includes all changes in archive..."
 msgstr ""
 
-#: ../dgit:4080
+#: ../dgit:4104
 msgid "maintainer view tag"
 msgstr ""
 
-#: ../dgit:4082
+#: ../dgit:4106
 msgid "dgit view tag"
 msgstr ""
 
-#: ../dgit:4083
+#: ../dgit:4107
 msgid "current archive contents"
 msgstr ""
 
-#: ../dgit:4096
+#: ../dgit:4120
 msgid ""
 "| Not fast forward; maybe --overwrite is needed ?  Please see dgit(1).\n"
 msgstr ""
 
-#: ../dgit:4106
+#: ../dgit:4130
 #, perl-format
 msgid "Declare fast forward from %s\n"
 msgstr ""
 
-#: ../dgit:4107
+#: ../dgit:4131
 #, perl-format
 msgid "Make fast forward from %s\n"
 msgstr ""
 
-#: ../dgit:4111
+#: ../dgit:4135
 #, perl-format
 msgid "Made pseudo-merge of %s into dgit view."
 msgstr ""
 
-#: ../dgit:4124
+#: ../dgit:4148
 #, perl-format
 msgid "Declare fast forward from %s"
 msgstr ""
 
-#: ../dgit:4132
+#: ../dgit:4156
 #, perl-format
 msgid "Make pseudo-merge of %s into your HEAD."
 msgstr ""
 
-#: ../dgit:4144
+#: ../dgit:4168
 #, perl-format
 msgid "-p specified %s but changelog specified %s"
 msgstr ""
 
-#: ../dgit:4166
+#: ../dgit:4190
 #, perl-format
 msgid "%s is for %s %s but debian/changelog is for %s %s"
 msgstr ""
 
-#: ../dgit:4227
+#: ../dgit:4251
 #, perl-format
 msgid "changes field %s `%s' does not match changelog `%s'"
 msgstr ""
 
-#: ../dgit:4255
+#: ../dgit:4279
 #, perl-format
 msgid "%s release %s for %s (%s) [dgit]\n"
 msgstr ""
 
-#: ../dgit:4268
+#: ../dgit:4292
 #, perl-format
 msgid ""
 "%s release %s for %s (%s)\n"
 "(maintainer view tag generated by dgit --quilt=%s)\n"
 msgstr ""
 
-#: ../dgit:4320
+#: ../dgit:4344
 msgid ""
 "Push failed, while checking state of the archive.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 
-#: ../dgit:4329
+#: ../dgit:4353
 msgid ""
 "package appears to be new in this suite; if this is intentional, use --new"
 msgstr ""
 
-#: ../dgit:4334
+#: ../dgit:4358
 msgid ""
 "Push failed, while preparing your push.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 
-#: ../dgit:4357
+#: ../dgit:4381
 #, perl-format
 msgid "looked for .dsc %s, but %s; maybe you forgot to build"
 msgstr ""
 
-#: ../dgit:4374
+#: ../dgit:4398
 #, perl-format
 msgid ""
 "Branch is managed by git-debrebase (%s\n"
@@ -1044,14 +1053,14 @@ msgid ""
 "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
 msgstr ""
 
-#: ../dgit:4398
+#: ../dgit:4422
 #, perl-format
 msgid ""
 "--quilt=%s but no cached dgit view:\n"
 " perhaps HEAD changed since dgit build[-source] ?"
 msgstr ""
 
-#: ../dgit:4429
+#: ../dgit:4453
 msgid ""
 "dgit push: HEAD is not a descendant of the archive's version.\n"
 "To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
@@ -1059,24 +1068,24 @@ msgid ""
 "forward."
 msgstr ""
 
-#: ../dgit:4439
+#: ../dgit:4463
 #, perl-format
 msgid "checking that %s corresponds to HEAD"
 msgstr ""
 
-#: ../dgit:4473 ../dgit:4485
+#: ../dgit:4497 ../dgit:4509
 #, perl-format
 msgid "HEAD specifies a different tree to %s:\n"
 msgstr ""
 
-#: ../dgit:4479
+#: ../dgit:4503
 #, perl-format
 msgid ""
 "There is a problem with your source tree (see dgit(7) for some hints).\n"
 "To see a full diff, run git diff %s %s\n"
 msgstr ""
 
-#: ../dgit:4489
+#: ../dgit:4513
 #, perl-format
 msgid ""
 "Perhaps you forgot to build.  Or perhaps there is a problem with your\n"
@@ -1084,52 +1093,52 @@ msgid ""
 "   git diff %s %s\n"
 msgstr ""
 
-#: ../dgit:4500
+#: ../dgit:4524
 #, perl-format
 msgid ""
 "failed to find unique changes file (looked for %s in %s); perhaps you need "
 "to use dgit -C"
 msgstr ""
 
-#: ../dgit:4522
-msgid "uploading binaries, although distroy policy is source only"
+#: ../dgit:4546
+msgid "uploading binaries, although distro policy is source only"
 msgstr ""
 
-#: ../dgit:4526
-msgid "source-only upload, although distroy policy requires .debs"
+#: ../dgit:4550
+msgid "source-only upload, although distro policy requires .debs"
 msgstr ""
 
-#: ../dgit:4530
+#: ../dgit:4554
 #, perl-format
 msgid ""
 "source-only upload, even though package is entirely NEW\n"
 "(this is contrary to policy in %s)"
 msgstr ""
 
-#: ../dgit:4537
+#: ../dgit:4561
 #, perl-format
 msgid "unknown source-only-uploads policy `%s'"
 msgstr ""
 
-#: ../dgit:4581
+#: ../dgit:4605
 msgid ""
 "Push failed, while signing the tag.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 
-#: ../dgit:4594
+#: ../dgit:4618
 msgid ""
 "Push failed, *after* signing the tag.\n"
 "If you want to try again, you should use a new version number.\n"
 msgstr ""
 
-#: ../dgit:4611
+#: ../dgit:4635
 msgid ""
 "Push failed, while updating the remote git repository - see messages above.\n"
 "If you want to try again, you should use a new version number.\n"
 msgstr ""
 
-#: ../dgit:4628
+#: ../dgit:4652
 msgid ""
 "Push failed, while obtaining signatures on the .changes and .dsc.\n"
 "If it was just that the signature failed, you may try again by using\n"
@@ -1138,155 +1147,155 @@ msgid ""
 "If you need to change the package, you must use a new version number.\n"
 msgstr ""
 
-#: ../dgit:4659
+#: ../dgit:4683
 #, perl-format
 msgid "pushed and uploaded %s"
 msgstr ""
 
-#: ../dgit:4671
+#: ../dgit:4695
 msgid "-p is not allowed with clone; specify as argument instead"
 msgstr ""
 
-#: ../dgit:4682
+#: ../dgit:4706
 msgid "incorrect arguments to dgit clone"
 msgstr ""
 
-#: ../dgit:4688
+#: ../dgit:4712 ../git-debrebase:1839
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../dgit:4702
+#: ../dgit:4726
 #, perl-format
 msgid "remove %s: %s\n"
 msgstr ""
 
-#: ../dgit:4706
+#: ../dgit:4730
 #, perl-format
 msgid "check whether to remove %s: %s\n"
 msgstr ""
 
-#: ../dgit:4744
+#: ../dgit:4768
 msgid "incorrect arguments to dgit fetch or dgit pull"
 msgstr ""
 
-#: ../dgit:4761
+#: ../dgit:4785
 #, perl-format
 msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
 msgstr ""
 
-#: ../dgit:4770
+#: ../dgit:4794
 msgid "dgit checkout needs a suite argument"
 msgstr ""
 
-#: ../dgit:4832
+#: ../dgit:4856
 #, perl-format
 msgid "setting up vcs-git: %s\n"
 msgstr ""
 
-#: ../dgit:4835
+#: ../dgit:4859
 #, perl-format
 msgid "vcs git already configured: %s\n"
 msgstr ""
 
-#: ../dgit:4837
+#: ../dgit:4861
 #, perl-format
 msgid "changing vcs-git url to: %s\n"
 msgstr ""
 
-#: ../dgit:4842
+#: ../dgit:4866
 #, perl-format
 msgid "fetching (%s)\n"
 msgstr ""
 
-#: ../dgit:4857
+#: ../dgit:4881
 #, perl-format
 msgid "incorrect arguments to dgit %s"
 msgstr ""
 
-#: ../dgit:4868
+#: ../dgit:4892
 #, perl-format
 msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
 msgstr ""
 
-#: ../dgit:4906
+#: ../dgit:4930
 #, perl-format
 msgid ""
 "build host has dgit rpush protocol versions %s but invocation host has %s"
 msgstr ""
 
-#: ../dgit:4986
+#: ../dgit:5010
 #, perl-format
 msgid "create %s: %s"
 msgstr ""
 
-#: ../dgit:5023
+#: ../dgit:5047
 #, perl-format
 msgid "build host child failed: %s"
 msgstr ""
 
-#: ../dgit:5026
+#: ../dgit:5050
 msgid "all done\n"
 msgstr ""
 
-#: ../dgit:5035
+#: ../dgit:5059
 #, perl-format
 msgid "file %s (%s) twice"
 msgstr ""
 
-#: ../dgit:5043
+#: ../dgit:5067
 msgid "bad param spec"
 msgstr ""
 
-#: ../dgit:5049
+#: ../dgit:5073
 msgid "bad previously spec"
 msgstr ""
 
-#: ../dgit:5068
+#: ../dgit:5092
 #, perl-format
 msgid ""
 "rpush negotiated protocol version %s which does not support quilt mode %s"
 msgstr ""
 
-#: ../dgit:5113
+#: ../dgit:5137
 #, perl-format
 msgid "buildinfo mismatch in field %s"
 msgstr ""
 
-#: ../dgit:5116
+#: ../dgit:5140
 #, perl-format
 msgid "buildinfo contains forbidden field %s"
 msgstr ""
 
-#: ../dgit:5157
+#: ../dgit:5181
 msgid "remote changes file"
 msgstr ""
 
-#: ../dgit:5232
+#: ../dgit:5256
 msgid "not a plain file or symlink\n"
 msgstr ""
 
-#: ../dgit:5238
+#: ../dgit:5262
 msgid "mode or type changed\n"
 msgstr ""
 
-#: ../dgit:5239
+#: ../dgit:5263
 msgid "modified symlink\n"
 msgstr ""
 
-#: ../dgit:5242
+#: ../dgit:5266
 msgid "deletion of symlink\n"
 msgstr ""
 
-#: ../dgit:5246
+#: ../dgit:5270
 msgid "creation with non-default mode\n"
 msgstr ""
 
-#: ../dgit:5276
+#: ../dgit:5300
 msgid "dgit view: changes are required..."
 msgstr ""
 
-#: ../dgit:5305
+#: ../dgit:5329
 #, perl-format
 msgid ""
 "\n"
@@ -1294,31 +1303,31 @@ msgid ""
 " %s\n"
 msgstr ""
 
-#: ../dgit:5312
+#: ../dgit:5336
 #, perl-format
 msgid ""
 "--quilt=%s specified, implying patches-unapplied git tree\n"
 " but git tree differs from orig in upstream files."
 msgstr ""
 
-#: ../dgit:5318
+#: ../dgit:5342
 msgid ""
 "\n"
 " ... debian/patches is missing; perhaps this is a patch queue branch?"
 msgstr ""
 
-#: ../dgit:5325
+#: ../dgit:5349
 #, perl-format
 msgid ""
 "--quilt=%s specified, implying patches-applied git tree\n"
 " but git tree differs from result of applying debian/patches to upstream\n"
 msgstr ""
 
-#: ../dgit:5332
+#: ../dgit:5356
 msgid "dgit view: creating patches-applied version using gbp pq"
 msgstr ""
 
-#: ../dgit:5341
+#: ../dgit:5365
 #, perl-format
 msgid ""
 "--quilt=%s specified, implying that HEAD is for use with a\n"
@@ -1326,16 +1335,16 @@ msgid ""
 " .gitignores: but, such patches exist in debian/patches.\n"
 msgstr ""
 
-#: ../dgit:5350
+#: ../dgit:5374
 msgid "dgit view: creating patch to represent .gitignore changes"
 msgstr ""
 
-#: ../dgit:5355
+#: ../dgit:5379
 #, perl-format
 msgid "%s already exists; but want to create it to record .gitignore changes"
 msgstr ""
 
-#: ../dgit:5360
+#: ../dgit:5384
 msgid ""
 "Subject: Update .gitignore from Debian packaging branch\n"
 "\n"
@@ -1344,63 +1353,63 @@ msgid ""
 "updates to users of the official Debian archive view of the package.\n"
 msgstr ""
 
-#: ../dgit:5382
+#: ../dgit:5406
 msgid "Commit patch to update .gitignore\n"
 msgstr ""
 
-#: ../dgit:5396
+#: ../dgit:5420
 msgid "converted"
 msgstr ""
 
-#: ../dgit:5397
+#: ../dgit:5421
 #, perl-format
 msgid "dgit view: created (%s)"
 msgstr ""
 
-#: ../dgit:5462
+#: ../dgit:5486
 msgid "maximum search space exceeded"
 msgstr ""
 
-#: ../dgit:5480
+#: ../dgit:5504
 #, perl-format
 msgid "has %s not %s"
 msgstr ""
 
-#: ../dgit:5489
+#: ../dgit:5513
 msgid "root commit"
 msgstr ""
 
-#: ../dgit:5495
+#: ../dgit:5519
 #, perl-format
 msgid "merge (%s nontrivial parents)"
 msgstr ""
 
-#: ../dgit:5506
+#: ../dgit:5531
 #, perl-format
 msgid "changed %s"
 msgstr ""
 
-#: ../dgit:5525
+#: ../dgit:5550
 #, perl-format
 msgid ""
 "\n"
 "%s: error: quilt fixup cannot be linear.  Stopped at:\n"
 msgstr ""
 
-#: ../dgit:5532
+#: ../dgit:5557
 #, perl-format
 msgid "%s:  %s: %s\n"
 msgstr ""
 
-#: ../dgit:5544
+#: ../dgit:5569
 msgid "quilt history linearisation failed.  Search `quilt fixup' in dgit(7).\n"
 msgstr ""
 
-#: ../dgit:5547
+#: ../dgit:5572
 msgid "quilt fixup cannot be linear, smashing..."
 msgstr ""
 
-#: ../dgit:5559
+#: ../dgit:5584
 #, perl-format
 msgid ""
 "Automatically generated patch (%s)\n"
@@ -1408,68 +1417,68 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:5566
+#: ../dgit:5591
 msgid "quiltify linearisation planning successful, executing..."
 msgstr ""
 
-#: ../dgit:5600
+#: ../dgit:5625
 msgid "contains unexpected slashes\n"
 msgstr ""
 
-#: ../dgit:5601
+#: ../dgit:5626
 msgid "contains leading punctuation\n"
 msgstr ""
 
-#: ../dgit:5602
+#: ../dgit:5627
 msgid "contains bad character(s)\n"
 msgstr ""
 
-#: ../dgit:5603
+#: ../dgit:5628
 msgid "is series file\n"
 msgstr ""
 
-#: ../dgit:5604
+#: ../dgit:5629
 msgid "too long\n"
 msgstr ""
 
-#: ../dgit:5608
+#: ../dgit:5633
 #, perl-format
 msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
 msgstr ""
 
-#: ../dgit:5637
+#: ../dgit:5662
 #, perl-format
 msgid "dgit: patch title transliteration error: %s"
 msgstr ""
 
-#: ../dgit:5774
+#: ../dgit:5802
 msgid "Commit removal of .pc (quilt series tracking data)\n"
 msgstr ""
 
-#: ../dgit:5784
+#: ../dgit:5812
 msgid "starting quiltify (single-debian-patch)"
 msgstr ""
 
-#: ../dgit:5884
+#: ../dgit:5914
 #, perl-format
 msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
 msgstr ""
 
-#: ../dgit:5915
+#: ../dgit:5945
 #, perl-format
 msgid "dgit view: found cached (%s)"
 msgstr ""
 
-#: ../dgit:5920
+#: ../dgit:5950
 msgid "dgit view: found cached, no changes required"
 msgstr ""
 
-#: ../dgit:5931
+#: ../dgit:5961
 #, perl-format
 msgid "examining quilt state (multiple patches, %s mode)"
 msgstr ""
 
-#: ../dgit:6022
+#: ../dgit:6052
 msgid ""
 "failed to apply your git tree's patch stack (from debian/patches/) to\n"
 " the corresponding upstream tarball(s).  Your source tree and .orig\n"
@@ -1477,58 +1486,58 @@ msgid ""
 " anomaly (depending on the quilt mode).  Please see --quilt= in dgit(1).\n"
 msgstr ""
 
-#: ../dgit:6036
+#: ../dgit:6066
 msgid "Tree already contains .pc - will use it then delete it."
 msgstr ""
 
-#: ../dgit:6073
+#: ../dgit:6103
 #, perl-format
 msgid "%s: base trees orig=%.20s o+d/p=%.20s"
 msgstr ""
 
-#: ../dgit:6076
+#: ../dgit:6106
 #, perl-format
 msgid ""
 "%s: quilt differences: src:  %s orig %s     gitignores:  %s orig %s\n"
 "%s: quilt differences:      HEAD %s o+d/p               HEAD %s o+d/p"
 msgstr ""
 
-#: ../dgit:6082
+#: ../dgit:6112
 #, perl-format
 msgid "dgit:  cannot represent change: %s: %s\n"
 msgstr ""
 
-#: ../dgit:6086
+#: ../dgit:6116
 msgid ""
 "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
 msgstr ""
 
-#: ../dgit:6093
+#: ../dgit:6123
 msgid "This might be a patches-unapplied branch."
 msgstr ""
 
-#: ../dgit:6096
+#: ../dgit:6126
 msgid "This might be a patches-applied branch."
 msgstr ""
 
-#: ../dgit:6099
+#: ../dgit:6129
 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
 msgstr ""
 
-#: ../dgit:6102
+#: ../dgit:6132
 msgid "Warning: Tree has .gitattributes.  See GITATTRIBUTES in dgit(7)."
 msgstr ""
 
-#: ../dgit:6106
+#: ../dgit:6136
 msgid "Maybe orig tarball(s) are not identical to git representation?"
 msgstr ""
 
-#: ../dgit:6115
+#: ../dgit:6145
 #, perl-format
 msgid "starting quiltify (multiple patches, %s mode)"
 msgstr ""
 
-#: ../dgit:6153
+#: ../dgit:6183
 msgid ""
 "\n"
 "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@ -1537,81 +1546,98 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:6165
+#: ../dgit:6195
 msgid "dgit: Unapplying patches again to tidy up the tree."
 msgstr ""
 
-#: ../dgit:6199
+#: ../dgit:6223
+#, perl-format
+msgid ""
+"%s\n"
+"If this is just missing .gitignore entries, use a different clean\n"
+"mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\n"
+"or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
+msgstr ""
+
+#: ../dgit:6237
 msgid "tree contains uncommitted files and --clean=check specified"
 msgstr ""
 
-#: ../dgit:6208
+#: ../dgit:6240
+msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
+msgstr ""
+
+#: ../dgit:6261
+msgid "tree contains uncommitted files (after running rules clean)"
+msgstr ""
+
+#: ../dgit:6275
 msgid "clean takes no additional arguments"
 msgstr ""
 
-#: ../dgit:6221
+#: ../dgit:6288
 #, perl-format
 msgid "-p is not allowed with dgit %s"
 msgstr ""
 
-#: ../dgit:6248
+#: ../dgit:6324
 #, perl-format
 msgid "remove old changes file %s: %s"
 msgstr ""
 
-#: ../dgit:6250
+#: ../dgit:6326
 #, perl-format
 msgid "would remove %s"
 msgstr ""
 
-#: ../dgit:6276
+#: ../dgit:6352
 msgid "archive query failed (queried because --since-version not specified)"
 msgstr ""
 
-#: ../dgit:6282
+#: ../dgit:6358
 #, perl-format
 msgid "changelog will contain changes since %s"
 msgstr ""
 
-#: ../dgit:6285
+#: ../dgit:6361
 msgid "package seems new, not specifying -v<version>"
 msgstr ""
 
-#: ../dgit:6328
+#: ../dgit:6404
 msgid "Wanted to build nothing!"
 msgstr ""
 
-#: ../dgit:6366
+#: ../dgit:6442
 #, perl-format
 msgid "only one changes file from build (%s)\n"
 msgstr ""
 
-#: ../dgit:6373
+#: ../dgit:6449
 #, perl-format
 msgid "%s found in binaries changes file %s"
 msgstr ""
 
-#: ../dgit:6380
+#: ../dgit:6456
 #, perl-format
 msgid "%s unexpectedly not created by build"
 msgstr ""
 
-#: ../dgit:6384
+#: ../dgit:6460
 #, perl-format
 msgid "install new changes %s{,.inmulti}: %s"
 msgstr ""
 
-#: ../dgit:6389
+#: ../dgit:6465
 #, perl-format
 msgid "wrong number of different changes files (%s)"
 msgstr ""
 
-#: ../dgit:6392
+#: ../dgit:6468
 #, perl-format
 msgid "build successful, results in %s\n"
 msgstr ""
 
-#: ../dgit:6405
+#: ../dgit:6481
 #, perl-format
 msgid ""
 "changes files other than source matching %s already present; building would "
@@ -1619,154 +1645,158 @@ msgid ""
 "Suggest you delete %s.\n"
 msgstr ""
 
-#: ../dgit:6423
+#: ../dgit:6499
 msgid "build successful\n"
 msgstr ""
 
-#: ../dgit:6430
+#: ../dgit:6506
 #, perl-format
 msgid ""
 "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n"
 "%s: warning: build-products-dir will be ignored; files will go to ..\n"
 msgstr ""
 
-#: ../dgit:6542
+#: ../dgit:6616
 #, perl-format
 msgid "remove %s: %s"
 msgstr ""
 
-#: ../dgit:6579
+#: ../dgit:6651
+msgid "--include-dirty not supported with --build-products-dir, sorry"
+msgstr ""
+
+#: ../dgit:6671
 #, perl-format
 msgid "put in place new built file (%s): %s"
 msgstr ""
 
-#: ../dgit:6592
+#: ../dgit:6684
 msgid "build-source takes no additional arguments"
 msgstr ""
 
-#: ../dgit:6596
+#: ../dgit:6688
 #, perl-format
 msgid "source built, results in %s and %s"
 msgstr ""
 
-#: ../dgit:6603
+#: ../dgit:6695
 msgid ""
 "dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
 "push-source!"
 msgstr ""
 
-#: ../dgit:6609
+#: ../dgit:6701
 msgid "source changes file"
 msgstr ""
 
-#: ../dgit:6611
+#: ../dgit:6703
 msgid "user-specified changes file is not source-only"
 msgstr ""
 
-#: ../dgit:6631 ../dgit:6633
+#: ../dgit:6723 ../dgit:6725
 #, perl-format
 msgid "%s (in build products dir): %s"
 msgstr ""
 
-#: ../dgit:6646
+#: ../dgit:6738
 msgid ""
 "perhaps you need to pass -A ?  (sbuild's default is to build only\n"
 "arch-specific binaries; dgit 1.4 used to override that.)\n"
 msgstr ""
 
-#: ../dgit:6658
+#: ../dgit:6750
 msgid ""
 "you asked for a builder but your debbuildopts didn't ask for any binaries -- "
 "is this really what you meant?"
 msgstr ""
 
-#: ../dgit:6662
+#: ../dgit:6754
 msgid ""
 "we must build a .dsc to pass to the builder but your debbuiltopts forbids "
 "the building of a source package; cannot continue"
 msgstr ""
 
-#: ../dgit:6692
+#: ../dgit:6784
 msgid "incorrect arguments to dgit print-unapplied-treeish"
 msgstr ""
 
-#: ../dgit:6714
+#: ../dgit:6806
 msgid "source tree"
 msgstr ""
 
-#: ../dgit:6716
+#: ../dgit:6808
 #, perl-format
 msgid "dgit: import-dsc: %s"
 msgstr ""
 
-#: ../dgit:6729
+#: ../dgit:6821
 #, perl-format
 msgid "unknown dgit import-dsc sub-option `%s'"
 msgstr ""
 
-#: ../dgit:6733
+#: ../dgit:6825
 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
 msgstr ""
 
-#: ../dgit:6737
+#: ../dgit:6829
 msgid "dry run makes no sense with import-dsc"
 msgstr ""
 
-#: ../dgit:6754
+#: ../dgit:6846
 #, perl-format
 msgid "%s is checked out - will not update it"
 msgstr ""
 
-#: ../dgit:6759
+#: ../dgit:6851
 #, perl-format
 msgid "open import .dsc (%s): %s"
 msgstr ""
 
-#: ../dgit:6761
+#: ../dgit:6853
 #, perl-format
 msgid "read %s: %s"
 msgstr ""
 
-#: ../dgit:6772
+#: ../dgit:6864
 msgid "import-dsc signature check failed"
 msgstr ""
 
-#: ../dgit:6775
+#: ../dgit:6867
 #, perl-format
 msgid "%s: warning: importing unsigned .dsc\n"
 msgstr ""
 
-#: ../dgit:6786
+#: ../dgit:6878
 msgid "Dgit metadata in .dsc"
 msgstr ""
 
-#: ../dgit:6797
+#: ../dgit:6889
 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
 msgstr ""
 
-#: ../dgit:6806
+#: ../dgit:6898
 #, perl-format
 msgid ""
 ".dsc contains Dgit field referring to object %s\n"
 "Your git tree does not have that object.  Try `git fetch' from a\n"
-"plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.\n"
+"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
 msgstr ""
 
-#: ../dgit:6813
+#: ../dgit:6905
 msgid "Not fast forward, forced update."
 msgstr ""
 
-#: ../dgit:6815
+#: ../dgit:6907
 #, perl-format
 msgid "Not fast forward to %s"
 msgstr ""
 
-#: ../dgit:6820
+#: ../dgit:6912
 #, perl-format
 msgid "updated git ref %s"
 msgstr ""
 
-#: ../dgit:6825
+#: ../dgit:6917
 #, perl-format
 msgid ""
 "Branch %s already exists\n"
@@ -1774,197 +1804,864 @@ msgid ""
 "Specify  +%s to overwrite, discarding existing history\n"
 msgstr ""
 
-#: ../dgit:6837
+#: ../dgit:6929
 #, perl-format
 msgid "lstat %s works but stat gives %s !"
 msgstr ""
 
-#: ../dgit:6839
+#: ../dgit:6931
 #, perl-format
 msgid "stat %s: %s"
 msgstr ""
 
-#: ../dgit:6847
+#: ../dgit:6939
 #, perl-format
 msgid "cannot import %s which seems to be inside working tree!"
 msgstr ""
 
-#: ../dgit:6851
+#: ../dgit:6943
 #, perl-format
 msgid "import %s requires .../%s, but it does not exist"
 msgstr ""
 
-#: ../dgit:6856
+#: ../dgit:6948
 #, perl-format
 msgid "import %s requires %s, but: %s"
 msgstr ""
 
-#: ../dgit:6858
+#: ../dgit:6950
 #, perl-format
 msgid "symlink %s to %s: %s"
 msgstr ""
 
-#: ../dgit:6859
+#: ../dgit:6951
 #, perl-format
 msgid "made symlink %s -> %s"
 msgstr ""
 
-#: ../dgit:6870
+#: ../dgit:6962
 msgid "Import, forced update - synthetic orphan git history."
 msgstr ""
 
-#: ../dgit:6872
+#: ../dgit:6964
 msgid "Import, merging."
 msgstr ""
 
-#: ../dgit:6886
+#: ../dgit:6978
 #, perl-format
 msgid "Merge %s (%s) import into %s\n"
 msgstr ""
 
-#: ../dgit:6895
+#: ../dgit:6987
 #, perl-format
-msgid "results are in in git ref %s"
+msgid "results are in git ref %s"
 msgstr ""
 
-#: ../dgit:6902
+#: ../dgit:6994
 msgid "need only 1 subpath argument"
 msgstr ""
 
-#: ../dgit:6908
+#: ../dgit:7000
 #, perl-format
 msgid "exec curl: %s\n"
 msgstr ""
 
-#: ../dgit:6922
+#: ../dgit:7014
 msgid "need destination argument"
 msgstr ""
 
-#: ../dgit:6927
+#: ../dgit:7019
 #, perl-format
 msgid "exec git clone: %s\n"
 msgstr ""
 
-#: ../dgit:6935
+#: ../dgit:7027
 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
 msgstr ""
 
-#: ../dgit:6946
+#: ../dgit:7038
 msgid "no arguments allowed to dgit print-dpkg-source-ignores"
 msgstr ""
 
-#: ../dgit:6952
+#: ../dgit:7044
 msgid "no arguments allowed to dgit setup-mergechangelogs"
 msgstr ""
 
-#: ../dgit:6959 ../dgit:6965
+#: ../dgit:7051 ../dgit:7057
 msgid "no arguments allowed to dgit setup-useremail"
 msgstr ""
 
-#: ../dgit:6971
+#: ../dgit:7063
 msgid "no arguments allowed to dgit setup-tree"
 msgstr ""
 
-#: ../dgit:7018
+#: ../dgit:7110
 msgid ""
 "--initiator-tempdir must be used specify an absolute, not relative, "
 "directory."
 msgstr ""
 
-#: ../dgit:7057
+#: ../dgit:7149
 #, perl-format
 msgid "%s needs a value"
 msgstr ""
 
-#: ../dgit:7061
+#: ../dgit:7153
 #, perl-format
 msgid "bad value `%s' for %s"
 msgstr ""
 
-#: ../dgit:7146
+#: ../dgit:7238
 #, perl-format
 msgid "%s: warning: ignoring unknown force option %s\n"
 msgstr ""
 
-#: ../dgit:7166
+#: ../dgit:7258
 #, perl-format
 msgid "unknown long option `%s'"
 msgstr ""
 
-#: ../dgit:7219
+#: ../dgit:7314
 #, perl-format
 msgid "unknown short option `%s'"
 msgstr ""
 
-#: ../dgit:7234
+#: ../dgit:7329
 #, perl-format
 msgid "%s is set to something other than SIG_DFL\n"
 msgstr ""
 
-#: ../dgit:7238
+#: ../dgit:7333
 #, perl-format
 msgid "%s is blocked\n"
 msgstr ""
 
-#: ../dgit:7244
+#: ../dgit:7339
 #, perl-format
 msgid ""
 "On entry to dgit, %s\n"
-"This is a bug produced by something in in your execution environment.\n"
+"This is a bug produced by something in your execution environment.\n"
 "Giving up.\n"
 msgstr ""
 
-#: ../dgit:7261
+#: ../dgit:7356
 #, perl-format
 msgid "cannot set command for %s"
 msgstr ""
 
-#: ../dgit:7274
+#: ../dgit:7369
 #, perl-format
 msgid "cannot configure options for %s"
 msgstr ""
 
-#: ../dgit:7294
+#: ../dgit:7389
 #, perl-format
 msgid "unknown quilt-mode `%s'"
 msgstr ""
 
-#: ../dgit:7304
+#: ../dgit:7399
 #, perl-format
 msgid "unknown %s setting `%s'"
 msgstr ""
 
-#: ../dgit:7309
+#: ../dgit:7404
 msgid "dgit: --include-dirty is not supported in split view quilt mode"
 msgstr ""
 
-#: ../dgit:7317
+#: ../dgit:7415
 #, perl-format
 msgid "unknown clean-mode `%s'"
 msgstr ""
 
-#: ../dgit:7338
+#: ../dgit:7436
 msgid "DRY RUN ONLY\n"
 msgstr ""
 
-#: ../dgit:7339
+#: ../dgit:7437
 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
 msgstr ""
 
-#: ../dgit:7355
+#: ../dgit:7456
 #, perl-format
 msgid "unknown operation %s"
 msgstr ""
 
-#: ../git-debrebase:2069
+#: ../git-debrebase:44
+msgid ""
+"usages:\n"
+"  git-debrebase [<options>] [--|-i <git rebase options...>]\n"
+"  git-debrebase [<options>] status\n"
+"  git-debrebase [<options>] prepush [--prose=...]\n"
+"  git-debrebase [<options>] quick|conclude\n"
+"  git-debrebase [<options>] new-upstream <new-version> [<details ...>]\n"
+"  git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]\n"
+"  ...\n"
+"See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
+msgstr ""
+
+#: ../git-debrebase:67
+#, perl-format
+msgid "%s: bad usage: %s\n"
+msgstr ""
+
+#: ../git-debrebase:78
+#, perl-format
+msgid "bad options follow `git-debrebase %s'"
+msgstr ""
+
+#: ../git-debrebase:89
+#, perl-format
+msgid "missing required git config %s"
+msgstr ""
+
+#: ../git-debrebase:401
+#, perl-format
+msgid "%s: snag ignored (-f%s): %s\n"
+msgstr ""
+
+#: ../git-debrebase:404
+#, perl-format
+msgid "%s: snag detected (-f%s): %s\n"
+msgstr ""
+
+#: ../git-debrebase:417
+#, perl-format
+msgid "%s: snags: %d overriden by individual -f options\n"
+msgstr ""
+
+#: ../git-debrebase:423
+#, perl-format
+msgid "%s: snags: %d overriden by global --force\n"
+msgstr ""
+
+#: ../git-debrebase:427
+#, perl-format
+msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
+msgstr ""
+
+#: ../git-debrebase:459
+msgid ""
+"Branch/history seems mangled - no longer in gdr format.\n"
+"See ILLEGAL OPERATIONS in git-debrebase(5).\n"
+msgstr ""
+
+#: ../git-debrebase:466
+#, perl-format
+msgid ""
+"%s\n"
+"Is this meant to be a gdr branch?  %s\n"
+msgstr ""
+
+#: ../git-debrebase:471
+#, perl-format
+msgid ""
+"%s\n"
+"%s\n"
+"Consider git-debrebase scrap, to throw away your recent work.\n"
+msgstr ""
+
+#: ../git-debrebase:477
+#, perl-format
+msgid ""
+"%s\n"
+"Branch does not seem to be meant to be a git-debrebase branch?\n"
+"Wrong branch, or maybe you needed git-debrebase convert-from-*.\n"
+msgstr ""
+
+#: ../git-debrebase:488
+#, perl-format
+msgid ""
+"%s\n"
+"Branch/history mangled, and diverged since last git-debrebase.\n"
+"Maybe you reset to, or rebased from, somewhere inappropriate.\n"
+msgstr ""
+
+#: ../git-debrebase:935
+#, perl-format
+msgid "git-debrebase `anchor' but %s"
+msgstr ""
+
+#: ../git-debrebase:937
+msgid "has other than two parents"
+msgstr ""
+
+#: ../git-debrebase:938
+msgid "contains debian/patches"
+msgstr ""
+
+#: ../git-debrebase:964
+msgid "is an origin commit"
+msgstr ""
+
+#: ../git-debrebase:966
+msgid "upstream files differ from left parent"
+msgstr ""
+
+#: ../git-debrebase:968
+msgid "debian/ differs from right parent"
+msgstr ""
+
+#: ../git-debrebase:979
+msgid "edits debian/patches"
+msgstr ""
+
+#: ../git-debrebase:991
+msgid "parent's debian is not a directory"
+msgstr ""
+
+#: ../git-debrebase:998
+msgid "no changes"
+msgstr ""
+
+#: ../git-debrebase:1004
+msgid "origin commit"
+msgstr ""
+
+#: ../git-debrebase:1055
+#, perl-format
+msgid "unknown kind of merge from %s"
+msgstr ""
+
+#: ../git-debrebase:1058
+msgid "octopus merge"
+msgstr ""
+
+#: ../git-debrebase:1062
+msgid "general two-parent merge"
+msgstr ""
+
+#: ../git-debrebase:1079
+#, perl-format
+msgid "inconsistent anchors in merged-breakwaters %s"
+msgstr ""
+
+#: ../git-debrebase:1119
+#, perl-format
+msgid "branch needs laundering (run git-debrebase): %s"
+msgstr ""
+
+#: ../git-debrebase:1147
+#, perl-format
+msgid "packaging change (%s) follows upstream change"
+msgstr ""
+
+#: ../git-debrebase:1148
+#, perl-format
+msgid " (eg %s)"
+msgstr ""
+
+#: ../git-debrebase:1154
+msgid "found mixed upstream/packaging commit"
+msgstr ""
+
+#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168
+#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187
+#, perl-format
+msgid " (%s)"
+msgstr ""
+
+#: ../git-debrebase:1162
+#, perl-format
+msgid "found interchange bureaucracy commit (%s)"
+msgstr ""
+
+#: ../git-debrebase:1167
+msgid "found dgit dsc import"
+msgstr ""
+
+#: ../git-debrebase:1172
+msgid "found bare dgit dsc import with no prior history"
+msgstr ""
+
+#: ../git-debrebase:1178
+msgid "found vanilla merge"
+msgstr ""
+
+#: ../git-debrebase:1185
+#, perl-format
+msgid "found unprocessable commit, cannot cope: %s"
+msgstr ""
+
+#: ../git-debrebase:1253
+#, perl-format
+msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
+msgstr ""
+
+#: ../git-debrebase:1254
+#, perl-format
+msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
+msgstr ""
+
+#: ../git-debrebase:1375
+msgid "bare dgit dsc import"
+msgstr ""
+
+#: ../git-debrebase:1715 ../git-debrebase:1718
+#, perl-format
+msgid "mismatch %s ?"
+msgstr ""
+
+#: ../git-debrebase:1721
+#, perl-format
+msgid "mismatch %s != %s ?"
+msgstr ""
+
+#: ../git-debrebase:1731
+#, perl-format
+msgid "internal error %#x %s %s"
+msgstr ""
+
+#: ../git-debrebase:1759
+#, perl-format
+msgid "%s: laundered (head was %s)\n"
+msgstr ""
+
+#: ../git-debrebase:1773
+msgid "you are in the middle of a git-rebase already"
+msgstr ""
+
+#: ../git-debrebase:1799
+msgid "launder for rebase"
+msgstr ""
+
+#: ../git-debrebase:1804
+msgid "analyse does not support any options"
+msgstr ""
+
+#: ../git-debrebase:1806
+msgid "too many arguments to analyse"
+msgstr ""
+
+#: ../git-debrebase:1841
+msgid "HEAD symref is not to refs/heads/"
+msgstr ""
+
+#: ../git-debrebase:1864
+#, perl-format
+msgid "OK, you are ahead of %s\n"
+msgstr ""
+
+#: ../git-debrebase:1868
+#, perl-format
+msgid "you are behind %s, divergence risk"
+msgstr ""
+
+#: ../git-debrebase:1872
+#, perl-format
+msgid "you have diverged from %s"
+msgstr ""
+
+#: ../git-debrebase:1894
+msgid "remote dgit branch"
+msgstr ""
+
+#: ../git-debrebase:1897
+msgid "remote dgit branch for sid"
+msgstr ""
+
+#: ../git-debrebase:1925
+msgid "Recorded previous head for preservation"
+msgstr ""
+
+#: ../git-debrebase:1933
+#, perl-format
+msgid "could not record ffq-prev: %s"
+msgstr ""
+
+#: ../git-debrebase:1944
+#, perl-format
+msgid "could not check ffq-prev: %s"
+msgstr ""
+
+#: ../git-debrebase:1964
+msgid "fast forward"
+msgstr ""
+
+#: ../git-debrebase:1974
+msgid "Declare fast forward / record previous work"
+msgstr ""
+
+#: ../git-debrebase:1986
+msgid "No ffq-prev to stitch."
+msgstr ""
+
+#: ../git-debrebase:2016
+#, perl-format
+msgid ""
+"Could not determine appropriate upstream commitish.\n"
+" (Tried these tags: %s)\n"
+" Check version, and specify upstream commitish explicitly."
+msgstr ""
+
+#: ../git-debrebase:2033
+msgid "need NEW-VERSION [UPS-COMMITTISH]"
+msgstr ""
+
+#: ../git-debrebase:2038
+#, perl-format
+msgid "bad version number `%s'"
+msgstr ""
+
+#: ../git-debrebase:2055
+#, perl-format
+msgid "upstream piece `%s'"
+msgstr ""
+
+#: ../git-debrebase:2056
+msgid "upstream (main piece"
+msgstr ""
+
+#: ../git-debrebase:2076
+msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
+msgstr ""
+
+#: ../git-debrebase:2094
 msgid "old anchor is recognised due to --anchor, cannot check upstream"
 msgstr "old anchor is recognized due to --anchor, cannot check upstream"
 
-#: ../git-debrebase:2980
-msgid "git-debrebase: no cuddling to -i for git-rebase"
+#: ../git-debrebase:2110
+#, perl-format
+msgid ""
+"previous upstream combine %s mentions %d pieces (each implying one parent) "
+"but has %d parents (one per piece plus maybe a previous combine)"
+msgstr ""
+
+#: ../git-debrebase:2119
+#, perl-format
+msgid "previous upstream combine %s first piece is not `.'"
+msgstr ""
+
+#: ../git-debrebase:2132
+#, perl-format
+msgid ""
+"previous upstream %s is from git-debrebase but not an `upstream-combine' "
+"commit"
+msgstr ""
+
+#: ../git-debrebase:2143
+#, perl-format
+msgid "introducing upstream piece `%s'"
+msgstr ""
+
+#: ../git-debrebase:2146
+#, perl-format
+msgid "dropping upstream piece `%s'"
+msgstr ""
+
+#: ../git-debrebase:2149
+#, perl-format
+msgid "not fast forward: %s %s"
+msgstr ""
+
+#: ../git-debrebase:2260
+msgid "Previous head already recorded\n"
+msgstr ""
+
+#: ../git-debrebase:2264
+#, perl-format
+msgid "Could not preserve: %s"
+msgstr ""
+
+#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281
+#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404
+#: ../git-debrebase:2468
+msgid "no arguments allowed"
+msgstr ""
+
+#: ../git-debrebase:2303
+msgid "branch contains furniture (not laundered)"
+msgstr ""
+
+#: ../git-debrebase:2304
+msgid "branch is unlaundered"
+msgstr ""
+
+#: ../git-debrebase:2305
+msgid "branch needs laundering"
 msgstr ""
 
-#: ../git-debrebase:3011
+#: ../git-debrebase:2306
+msgid "branch not in git-debrebase form"
+msgstr ""
+
+#: ../git-debrebase:2316
+msgid "current branch contents, in git-debrebase terms:\n"
+msgstr ""
+
+#: ../git-debrebase:2318
+msgid "  branch is laundered\n"
+msgstr ""
+
+#: ../git-debrebase:2334
+#, perl-format
+msgid "  %s is not well-defined\n"
+msgstr ""
+
+#: ../git-debrebase:2340
+msgid "key git-debrebase commits:\n"
+msgstr ""
+
+#: ../git-debrebase:2341
+msgid "anchor"
+msgstr ""
+
+#: ../git-debrebase:2342
+msgid "breakwater"
+msgstr ""
+
+#: ../git-debrebase:2347
+msgid "branch and ref status, in git-debrebase terms:\n"
+msgstr ""
+
+#: ../git-debrebase:2354
+msgid "  unstitched; previous tip was:\n"
+msgstr ""
+
+#: ../git-debrebase:2357
+msgid "  stitched? (no record of git-debrebase work)\n"
+msgstr ""
+
+#: ../git-debrebase:2359
+msgid "  stitched\n"
+msgstr ""
+
+#: ../git-debrebase:2361
+msgid "  not git-debrebase (diverged since last stitch)\n"
+msgstr ""
+
+#: ../git-debrebase:2364
+msgid "you are currently rebasing\n"
+msgstr ""
+
+#: ../git-debrebase:2381 ../git-debrebase:2394
+msgid "launder for git-debrebase quick"
+msgstr ""
+
+#: ../git-debrebase:2388 ../git-debrebase:2418
+msgid "No ongoing git-debrebase session."
+msgstr ""
+
+#: ../git-debrebase:2457
+msgid "Commit patch queue (exported by git-debrebase)"
+msgstr ""
+
+#: ../git-debrebase:2474
+msgid "No (more) patches to export."
+msgstr ""
+
+#: ../git-debrebase:2481
+#, perl-format
+msgid ""
+"Patch export produced patch amendments (abandoned output commit %s).  Try "
+"laundering first."
+msgstr ""
+
+#: ../git-debrebase:2501
+#, perl-format
+msgid "%s contains comments, which will be discarded"
+msgstr ""
+
+#: ../git-debrebase:2506
+#, perl-format
+msgid "patch %s repeated in %s !"
+msgstr ""
+
+#: ../git-debrebase:2513
+#, perl-format
+msgid "Unused patch file %s will be discarded"
+msgstr ""
+
+#: ../git-debrebase:2521
+msgid "ffq-prev exists, this is already managed by git-debrebase!"
+msgstr ""
+
+#: ../git-debrebase:2526
+msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
+msgstr ""
+
+#: ../git-debrebase:2541
+msgid "want only 1 optional argument, the upstream git commitish"
+msgstr ""
+
+#: ../git-debrebase:2546
+msgid "missing Version from changelog\n"
+msgstr ""
+
+#: ../git-debrebase:2562
+#, perl-format
+msgid ""
+"upstream (%s) and HEAD are not\n"
+"identical in upstream files.  See diffstat above, or run\n"
+"  git diff %s HEAD -- :!/debian :/\n"
+msgstr ""
+
+#: ../git-debrebase:2570
+#, perl-format
+msgid "upstream (%s) is not an ancestor of HEAD"
+msgstr ""
+
+#: ../git-debrebase:2577
+#, perl-format
+msgid ""
+"history between upstream (%s) and HEAD contains direct changes to upstream "
+"files - are you sure this is a gbp (patches-unapplied) branch?"
+msgstr ""
+
+#: ../git-debrebase:2579
+#, perl-format
+msgid "list expected changes with:  %s\n"
+msgstr ""
+
+#: ../git-debrebase:2586
+#, perl-format
+msgid "upstream (%s) contains debian/ directory"
+msgstr ""
+
+#: ../git-debrebase:2604
+msgid "neither of the first two changelog entries are released\n"
+msgstr ""
+
+#: ../git-debrebase:2610
+#, perl-format
+msgid "could not find suitable maintainer view tag %s\n"
+msgstr ""
+
+#: ../git-debrebase:2613
+#, perl-format
+msgid "HEAD is not FF from maintainer tag %s!"
+msgstr ""
+
+#: ../git-debrebase:2616
+#, perl-format
+msgid "dgit view tag %s not found\n"
+msgstr ""
+
+#: ../git-debrebase:2618
+#, perl-format
+msgid "dgit view tag %s is not FF from maintainer tag %s\n"
+msgstr ""
+
+#: ../git-debrebase:2620
+#, perl-format
+msgid "will stitch in dgit view, %s\n"
+msgstr ""
+
+#: ../git-debrebase:2627
+#, perl-format
+msgid ""
+"Cannot confirm dgit view: %s\n"
+"Failed to stitch in dgit view (see messages above).\n"
+"dgit --overwrite will be needed on the first dgit push after conversion.\n"
+msgstr ""
+
+#: ../git-debrebase:2673
+#, perl-format
+msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
+msgstr ""
+
+#: ../git-debrebase:2702
+#, perl-format
+msgid ""
+"%s: converted to git-buildpackage branch format\n"
+"%s: WARNING: do not now run \"git-debrebase\" any more\n"
+"%s: WARNING: doing so would drop all upstream patches!\n"
+msgstr ""
+
+#: ../git-debrebase:2723
+msgid "takes 1 optional argument, the upstream commitish"
+msgstr ""
+
+#: ../git-debrebase:2731
+#, perl-format
+msgid "%s, from command line"
+msgstr ""
+
+#: ../git-debrebase:2745
+#, perl-format
+msgid ""
+"%s: Branch already seems to be in git-debrebase format!\n"
+"%s: --always-convert-anyway would do the conversion operation anyway\n"
+"%s: but is probably a bad idea.  Probably, you wanted to do nothing.\n"
+msgstr ""
+
+#: ../git-debrebase:2749
+msgid "Branch already in git-debrebase format."
+msgstr ""
+
+#: ../git-debrebase:2761
+msgid "Considering possible commits corresponding to upstream:\n"
+msgstr ""
+
+#: ../git-debrebase:2768
+#, perl-format
+msgid "git tag %s"
+msgstr ""
+
+#: ../git-debrebase:2774
+#, perl-format
+msgid " git tag: no suitable tag found (tried %s)\n"
+msgstr ""
+
+#: ../git-debrebase:2783
+#, perl-format
+msgid "opendir build-products-dir %s: %s"
+msgstr ""
+
+#: ../git-debrebase:2789
+#, perl-format
+msgid " orig: found what looks like a .orig, %s\n"
+msgstr ""
+
+#: ../git-debrebase:2820
+#, perl-format
+msgid " orig: no suitable origs found (looked for %s in %s)\n"
+msgstr ""
+
+#: ../git-debrebase:2829
+msgid "Evaluating possible commits corresponding to upstream:\n"
+msgstr ""
+
+#: ../git-debrebase:2866
+#, perl-format
+msgid " %s: couldn't apply patches: gbp pq %s"
+msgstr ""
+
+#: ../git-debrebase:2875
+#, perl-format
+msgid " %s: applying patches gives different tree\n"
+msgstr ""
+
+#: ../git-debrebase:2889
+msgid ""
+"Could not find or construct a suitable upstream commit.\n"
+"Rerun adding --diagnose after convert-from-dgit-view, or pass a\n"
+"upstream commmit explicitly or provide suitable origs.\n"
+msgstr ""
+
+#: ../git-debrebase:2895
+#, perl-format
+msgid "Yes, will base new branch on %s\n"
+msgstr ""
+
+#: ../git-debrebase:2902
+msgid "forget-was-ever-debrebase takes no further arguments"
+msgstr ""
+
+#: ../git-debrebase:2906
+#, perl-format
+msgid "Not suitable for recording git-debrebaseness anyway: %s"
+msgstr ""
+
+#: ../git-debrebase:3008
+msgid "bad options\n"
+msgstr ""
+
+#: ../git-debrebase:3018
+#, perl-format
+msgid "%s: no cuddling to -i for git-rebase"
+msgstr ""
+
+#: ../git-debrebase:3048
 #, perl-format
 msgid "unknown git-debrebase sub-operation %s"
 msgstr ""
@@ -2016,64 +2713,96 @@ msgstr ""
 msgid "subprocess produced invalid output"
 msgstr ""
 
-#: ../Debian/Dgit.pm:544
+#: ../Debian/Dgit.pm:450
+msgid "stat source file: %S"
+msgstr ""
+
+#: ../Debian/Dgit.pm:460
+msgid "stat destination file: %S"
+msgstr ""
+
+#: ../Debian/Dgit.pm:479
+msgid "finally install file after cp: %S"
+msgstr ""
+
+#: ../Debian/Dgit.pm:485
+msgid "delete old file after cp: %S"
+msgstr ""
+
+#: ../Debian/Dgit.pm:506
+msgid ""
+"not in a git working tree?\n"
+"(git rev-parse --show-toplevel produced no output)\n"
+msgstr ""
+
+#: ../Debian/Dgit.pm:509
+#, perl-format
+msgid "chdir toplevel %s: %s\n"
+msgstr ""
+
+#: ../Debian/Dgit.pm:617
 msgid "git index contains changes (does not match HEAD)"
 msgstr ""
 
-#: ../Debian/Dgit.pm:545
+#: ../Debian/Dgit.pm:618
 msgid "working tree is dirty (does not match HEAD)"
 msgstr ""
 
-#: ../Debian/Dgit.pm:616
+#: ../Debian/Dgit.pm:689
 msgid "detached HEAD"
 msgstr ""
 
-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:690
 msgid "HEAD symref is not to refs/"
 msgstr ""
 
-#: ../Debian/Dgit.pm:633
+#: ../Debian/Dgit.pm:706
 #, perl-format
 msgid "parsing of %s failed"
 msgstr ""
 
-#: ../Debian/Dgit.pm:642
+#: ../Debian/Dgit.pm:715
 #, perl-format
 msgid ""
 "control file %s is (already) PGP-signed.  Note that dgit push needs to "
 "modify the .dsc and then do the signature itself"
 msgstr ""
 
-#: ../Debian/Dgit.pm:656
+#: ../Debian/Dgit.pm:729
 #, perl-format
 msgid "open %s (%s): %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:677
+#: ../Debian/Dgit.pm:750
 #, perl-format
 msgid "missing field %s in %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:749
+#: ../Debian/Dgit.pm:822
 msgid "Dummy commit - do not use\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:838
+#: ../Debian/Dgit.pm:843
+#, perl-format
+msgid "exec %s: %s\n"
+msgstr ""
+
+#: ../Debian/Dgit.pm:911
 #, perl-format
 msgid "cannot stat %s/.git: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:861
+#: ../Debian/Dgit.pm:934
 #, perl-format
 msgid "failed to mkdir playground parent %s: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:869
+#: ../Debian/Dgit.pm:942
 #, perl-format
 msgid "failed to mkdir a playground %s: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:878
+#: ../Debian/Dgit.pm:951
 #, perl-format
 msgid "failed to mkdir the playground %s: %s"
 msgstr ""
diff --git a/po/messages.pot b/po/messages.pot
index 9bd4618..9506b59 100644
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dgit ongoing\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 11:23+0000\n"
+"POT-Creation-Date: 2018-10-13 19:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,78 +17,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../dgit:236
+#: ../dgit:240
 #, perl-format
 msgid "%s: invalid configuration: %s\n"
 msgstr ""
 
-#: ../dgit:243
+#: ../dgit:247
 msgid "warning: overriding problem due to --force:\n"
 msgstr ""
 
-#: ../dgit:251
+#: ../dgit:255
 #, perl-format
 msgid "warning: skipping checks or functionality due to --force-%s\n"
 msgstr ""
 
-#: ../dgit:256
+#: ../dgit:260
 #, perl-format
 msgid "%s: package %s does not exist in suite %s\n"
 msgstr ""
 
-#: ../dgit:475
+#: ../dgit:483
 #, perl-format
 msgid "build host child %s"
 msgstr ""
 
-#: ../dgit:480 ../dgit:486
+#: ../dgit:488 ../dgit:494
 #, perl-format
 msgid "connection lost: %s"
 msgstr ""
 
-#: ../dgit:481
+#: ../dgit:489
 #, perl-format
 msgid "protocol violation; %s not expected"
 msgstr ""
 
-#: ../dgit:489
+#: ../dgit:497
 #, perl-format
 msgid "eof (reading %s)"
 msgstr ""
 
-#: ../dgit:496
+#: ../dgit:504
 msgid "protocol message"
 msgstr ""
 
-#: ../dgit:504
+#: ../dgit:512
 #, perl-format
 msgid "`%s'"
 msgstr ""
 
-#: ../dgit:525
+#: ../dgit:533
 msgid "bad byte count"
 msgstr ""
 
-#: ../dgit:528
+#: ../dgit:536
 msgid "data block"
 msgstr ""
 
-#: ../dgit:609
+#: ../dgit:617
 #, perl-format
 msgid "failed to fetch %s: %s"
 msgstr ""
 
-#: ../dgit:621
+#: ../dgit:629
 #, perl-format
 msgid "%s ok: %s"
 msgstr ""
 
-#: ../dgit:623
+#: ../dgit:631
 #, perl-format
 msgid "would be ok: %s (but dry run only)"
 msgstr ""
 
-#: ../dgit:648
+#: ../dgit:656
 msgid ""
 "main usages:\n"
 "  dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
@@ -109,136 +109,141 @@ msgid ""
 "  -c<name>=<value>    set git config option (used directly by dgit too)\n"
 msgstr ""
 
-#: ../dgit:667
+#: ../dgit:675
 msgid "Perhaps the upload is stuck in incoming.  Using the version from git.\n"
 msgstr ""
 
-#: ../dgit:671
+#: ../dgit:679
 #, perl-format
 msgid ""
 "%s: %s\n"
 "%s"
 msgstr ""
 
-#: ../dgit:676
+#: ../dgit:684
 msgid "too few arguments"
 msgstr ""
 
-#: ../dgit:787
+#: ../dgit:795
 #, perl-format
 msgid "multiple values for %s (in %s git config)"
 msgstr ""
 
-#: ../dgit:807
+#: ../dgit:798
+#, perl-format
+msgid "value for config option %s (in %s git config) contains newline(s)!"
+msgstr ""
+
+#: ../dgit:818
 #, perl-format
 msgid ""
 "need value for one of: %s\n"
 "%s: distro or suite appears not to be (properly) supported"
 msgstr ""
 
-#: ../dgit:848
+#: ../dgit:859
 #, perl-format
 msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
 msgstr ""
 
-#: ../dgit:863
+#: ../dgit:874
 #, perl-format
 msgid "backports-quirk needs % or ( )"
 msgstr ""
 
-#: ../dgit:879
+#: ../dgit:890
 #, perl-format
 msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
 msgstr ""
 
-#: ../dgit:899
+#: ../dgit:910
 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
 msgstr ""
 
-#: ../dgit:908 ../Debian/Dgit.pm:201
+#: ../dgit:919 ../git-debrebase:1586 ../Debian/Dgit.pm:201
 msgid "internal error"
 msgstr ""
 
-#: ../dgit:910
+#: ../dgit:921
 msgid "pushing but distro is configured readonly"
 msgstr ""
 
-#: ../dgit:914
+#: ../dgit:925
 msgid ""
 "Push failed, before we got started.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 
-#: ../dgit:1079
+#: ../dgit:1090
 msgid "this operation does not support multiple comma-separated suites"
 msgstr ""
 
-#: ../dgit:1125
+#: ../dgit:1136
 #, perl-format
 msgid ""
 "config requested specific TLS key but do not know how to get curl to use "
 "exactly that EE key (%s)"
 msgstr ""
 
-#: ../dgit:1146
+#: ../dgit:1157
 msgid "ftpmasterapi archive query method takes no data part"
 msgstr ""
 
-#: ../dgit:1154
+#: ../dgit:1165
 msgid "curl failed to print 3-digit HTTP code"
 msgstr ""
 
-#: ../dgit:1158
+#: ../dgit:1169
 #, perl-format
 msgid "fetch of %s gave HTTP code %s"
 msgstr ""
 
-#: ../dgit:1174
+#: ../dgit:1185
 #, perl-format
 msgid "unknown suite %s, maybe -d would help"
 msgstr ""
 
-#: ../dgit:1178
+#: ../dgit:1189
 #, perl-format
 msgid "multiple matches for suite %s\n"
 msgstr ""
 
-#: ../dgit:1180
+#: ../dgit:1191
 #, perl-format
 msgid "suite %s info has no codename\n"
 msgstr ""
 
-#: ../dgit:1182
+#: ../dgit:1193
 #, perl-format
 msgid "suite %s maps to bad codename\n"
 msgstr ""
 
-#: ../dgit:1184 ../dgit:1209
+#: ../dgit:1195 ../dgit:1220
 msgid "bad ftpmaster api response: "
 msgstr ""
 
-#: ../dgit:1198
+#: ../dgit:1209
 #, perl-format
 msgid "bad version: %s\n"
 msgstr ""
 
-#: ../dgit:1200
+#: ../dgit:1211
 msgid "bad component"
 msgstr ""
 
-#: ../dgit:1203
+#: ../dgit:1214
 msgid "bad filename"
 msgstr ""
 
-#: ../dgit:1205
+#: ../dgit:1216
 msgid "bad sha256sum"
 msgstr ""
 
-#: ../dgit:1256
+#: ../dgit:1267
 msgid "aptget archive query method takes no data part"
 msgstr ""
 
-#: ../dgit:1340
+#: ../dgit:1351
 #, perl-format
 msgid ""
 "apt seemed to not to update dgit's cached Release files for %s.\n"
@@ -246,163 +251,163 @@ msgid ""
 " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
 msgstr ""
 
-#: ../dgit:1362
+#: ../dgit:1373
 #, perl-format
 msgid "Release file (%s) specifies intolerable %s"
 msgstr ""
 
-#: ../dgit:1390
+#: ../dgit:1401
 msgid "apt-get source did not produce a .dsc"
 msgstr ""
 
-#: ../dgit:1391
+#: ../dgit:1402
 #, perl-format
 msgid "apt-get source produced several .dscs (%s)"
 msgstr ""
 
-#: ../dgit:1496
+#: ../dgit:1507
 #, perl-format
 msgid ""
 "unable to canonicalise suite using package %s which does not appear to exist "
 "in suite %s; --existing-package may help"
 msgstr ""
 
-#: ../dgit:1687
+#: ../dgit:1698
 #, perl-format
 msgid "cannot operate on %s suite"
 msgstr ""
 
-#: ../dgit:1690
+#: ../dgit:1701
 #, perl-format
 msgid "canonical suite name for %s is %s"
 msgstr ""
 
-#: ../dgit:1692
+#: ../dgit:1703
 #, perl-format
 msgid "canonical suite name is %s"
 msgstr ""
 
-#: ../dgit:1712
+#: ../dgit:1723
 #, perl-format
 msgid "%s has hash %s but archive told us to expect %s"
 msgstr ""
 
-#: ../dgit:1718
+#: ../dgit:1729
 #, perl-format
 msgid "unsupported source format %s, sorry"
 msgstr ""
 
-#: ../dgit:1745
+#: ../dgit:1756
 #, perl-format
 msgid "diverting to %s (using config for %s)"
 msgstr ""
 
-#: ../dgit:1762
+#: ../dgit:1773
 msgid "unexpected results from git check query - "
 msgstr ""
 
-#: ../dgit:1777
+#: ../dgit:1788
 #, perl-format
 msgid "unknown git-check `%s'"
 msgstr ""
 
-#: ../dgit:1792
+#: ../dgit:1803
 #, perl-format
 msgid "unknown git-create `%s'"
 msgstr ""
 
-#: ../dgit:1829
+#: ../dgit:1840
 #, perl-format
 msgid "%s: warning: removing from %s: %s\n"
 msgstr ""
 
-#: ../dgit:1875
+#: ../dgit:1886
 #, perl-format
 msgid "could not parse .dsc %s line `%s'"
 msgstr ""
 
-#: ../dgit:1886
+#: ../dgit:1897
 #, perl-format
 msgid "missing any supported Checksums-* or Files field in %s"
 msgstr ""
 
-#: ../dgit:1932
+#: ../dgit:1943
 #, perl-format
 msgid "hash or size of %s varies in %s fields (between: %s)"
 msgstr ""
 
-#: ../dgit:1941
+#: ../dgit:1952
 #, perl-format
 msgid "file list in %s varies between hash fields!"
 msgstr ""
 
-#: ../dgit:1945
+#: ../dgit:1956
 #, perl-format
 msgid "%s has no files list field(s)"
 msgstr ""
 
-#: ../dgit:1951
+#: ../dgit:1962
 #, perl-format
 msgid "no file appears in all file lists (looked in: %s)"
 msgstr ""
 
-#: ../dgit:1991
+#: ../dgit:2002
 #, perl-format
 msgid "purportedly source-only changes polluted by %s\n"
 msgstr ""
 
-#: ../dgit:2004
+#: ../dgit:2015
 msgid "cannot find section/priority from .changes Files field"
 msgstr ""
 
-#: ../dgit:2017
+#: ../dgit:2028
 msgid ""
 "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
 msgstr ""
 
-#: ../dgit:2033
+#: ../dgit:2044
 #, perl-format
 msgid ".dsc %s missing entry for %s"
 msgstr ""
 
-#: ../dgit:2038
+#: ../dgit:2049
 #, perl-format
 msgid "%s: %s (archive) != %s (local .dsc)"
 msgstr ""
 
-#: ../dgit:2046
+#: ../dgit:2057
 #, perl-format
 msgid "archive %s: %s"
 msgstr ""
 
-#: ../dgit:2053
+#: ../dgit:2064
 #, perl-format
 msgid "archive contains %s with different checksum"
 msgstr ""
 
-#: ../dgit:2081
+#: ../dgit:2092
 #, perl-format
 msgid "edited .changes for archive .orig contents: %s %s"
 msgstr ""
 
-#: ../dgit:2089
+#: ../dgit:2100
 #, perl-format
 msgid "[new .changes left in %s]"
 msgstr ""
 
-#: ../dgit:2092
+#: ../dgit:2103
 #, perl-format
 msgid "%s already has appropriate .orig(s) (if any)"
 msgstr ""
 
-#: ../dgit:2116
+#: ../dgit:2127
 #, perl-format
 msgid ""
 "unexpected commit author line format `%s' (was generated from changelog "
 "Maintainer field)"
 msgstr ""
 
-#: ../dgit:2139
+#: ../dgit:2150
 msgid ""
 "\n"
 "Unfortunately, this source package uses a feature of dpkg-source where\n"
@@ -417,67 +422,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:2151
+#: ../dgit:2162
 #, perl-format
 msgid ""
 "Found active distro-specific series file for %s (%s): %s, cannot continue"
 msgstr ""
 
-#: ../dgit:2182
+#: ../dgit:2193
 msgid "Dpkg::Vendor `current vendor'"
 msgstr ""
 
-#: ../dgit:2184
+#: ../dgit:2195
 msgid "(base) distro being accessed"
 msgstr ""
 
-#: ../dgit:2186
+#: ../dgit:2197
 msgid "(nominal) distro being accessed"
 msgstr ""
 
-#: ../dgit:2207 ../dgit:2212
+#: ../dgit:2218 ../dgit:2223
 #, perl-format
 msgid "accessing %s: %s"
 msgstr ""
 
-#: ../dgit:2227 ../dgit:2234
+#: ../dgit:2238 ../dgit:2245
 #, perl-format
 msgid "saving %s: %s"
 msgstr ""
 
-#: ../dgit:2300
+#: ../dgit:2311
 #, perl-format
 msgid "dgit (child): exec %s: %s"
 msgstr ""
 
-#: ../dgit:2364 ../dgit:5862
+#: ../dgit:2375 ../dgit:5892
 msgid "source package"
 msgstr ""
 
-#: ../dgit:2382
+#: ../dgit:2393
 msgid "package changelog"
 msgstr ""
 
-#: ../dgit:2422
+#: ../dgit:2433
 msgid "package changelog has no entries!"
 msgstr ""
 
-#: ../dgit:2441
+#: ../dgit:2452
 #, perl-format
 msgid "Import %s"
 msgstr ""
 
-#: ../dgit:2522
+#: ../dgit:2533
 #, perl-format
 msgid "%s: trying slow absurd-git-apply..."
 msgstr ""
 
-#: ../dgit:2541
+#: ../dgit:2552
 #, perl-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: ../dgit:2550
+#: ../dgit:2561
 #, perl-format
 msgid ""
 "gbp-pq import and dpkg-source disagree!\n"
@@ -486,21 +491,21 @@ msgid ""
 " dpkg-source --before-build gave tree %s\n"
 msgstr ""
 
-#: ../dgit:2565
+#: ../dgit:2576
 #, perl-format
 msgid "synthesised git commit from .dsc %s"
 msgstr ""
 
-#: ../dgit:2569
+#: ../dgit:2580
 msgid "Import of source package"
 msgstr ""
 
-#: ../dgit:2582
+#: ../dgit:2593
 #, perl-format
 msgid "Record %s (%s) in archive suite %s\n"
 msgstr ""
 
-#: ../dgit:2586
+#: ../dgit:2597
 #, perl-format
 msgid ""
 "\n"
@@ -509,51 +514,51 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:2628
+#: ../dgit:2639
 #, perl-format
 msgid "using existing %s"
 msgstr ""
 
-#: ../dgit:2632
+#: ../dgit:2643
 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
 "file?)"
 msgstr ""
 
-#: ../dgit:2636
+#: ../dgit:2647
 #, perl-format
 msgid "need to fetch correct version of %s"
 msgstr ""
 
-#: ../dgit:2652
+#: ../dgit:2663
 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
 msgstr ""
 
-#: ../dgit:2747
+#: ../dgit:2758
 msgid "too many iterations trying to get sane fetch!"
 msgstr ""
 
-#: ../dgit:2762
+#: ../dgit:2773
 #, perl-format
 msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
 msgstr ""
 
-#: ../dgit:2806
+#: ../dgit:2817
 #, perl-format
 msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
 msgstr ""
 
-#: ../dgit:2821
+#: ../dgit:2832
 msgid ""
 "--dry-run specified but we actually wanted the results of git fetch,\n"
 "so this is not going to work.  Try running dgit fetch first,\n"
 "or using --damp-run instead of --dry-run.\n"
 msgstr ""
 
-#: ../dgit:2826
+#: ../dgit:2837
 #, perl-format
 msgid ""
 "warning: git ls-remote suggests we want %s\n"
@@ -563,49 +568,49 @@ msgid ""
 "warning:  Will try again...\n"
 msgstr ""
 
-#: ../dgit:2893
+#: ../dgit:2904
 #, perl-format
 msgid "Not updating %s from %s to %s.\n"
 msgstr ""
 
-#: ../dgit:2942
+#: ../dgit:2953
 #, perl-format
 msgid "%s: NO git hash"
 msgstr ""
 
-#: ../dgit:2946
+#: ../dgit:2957
 #, perl-format
 msgid "%s: specified git info (%s)"
 msgstr ""
 
-#: ../dgit:2953
+#: ../dgit:2964
 #, perl-format
 msgid "%s: specified git hash"
 msgstr ""
 
-#: ../dgit:2955
+#: ../dgit:2966
 #, perl-format
 msgid "%s: invalid Dgit info"
 msgstr ""
 
-#: ../dgit:2977
+#: ../dgit:2988
 #, perl-format
 msgid "not chasing .dsc distro %s: not fetching %s"
 msgstr ""
 
-#: ../dgit:2982
+#: ../dgit:2993
 #, perl-format
 msgid ".dsc names distro %s: fetching %s"
 msgstr ""
 
-#: ../dgit:2987
+#: ../dgit:2998
 #, perl-format
 msgid ""
 ".dsc Dgit metadata is in context of distro %s\n"
 "for which we have no configured url and .dsc provides no hint\n"
 msgstr ""
 
-#: ../dgit:2997
+#: ../dgit:3008
 #, perl-format
 msgid ""
 ".dsc Dgit metadata is in context of distro %s\n"
@@ -614,54 +619,54 @@ msgid ""
 "(can be overridden by config - consult documentation)\n"
 msgstr ""
 
-#: ../dgit:3017
+#: ../dgit:3028
 msgid "rewrite map"
 msgstr ""
 
-#: ../dgit:3024
+#: ../dgit:3035
 msgid "server's git history rewrite map contains a relevant entry!"
 msgstr ""
 
-#: ../dgit:3028
+#: ../dgit:3039
 msgid "using rewritten git hash in place of .dsc value"
 msgstr ""
 
-#: ../dgit:3030
+#: ../dgit:3041
 msgid "server data says .dsc hash is to be disregarded"
 msgstr ""
 
-#: ../dgit:3037
+#: ../dgit:3048
 msgid "additional commits"
 msgstr ""
 
-#: ../dgit:3040
+#: ../dgit:3051
 #, perl-format
 msgid ""
 ".dsc Dgit metadata requires commit %s\n"
 "but we could not obtain that object anywhere.\n"
 msgstr ""
 
-#: ../dgit:3064
+#: ../dgit:3075
 msgid "last upload to archive"
 msgstr ""
 
-#: ../dgit:3068
+#: ../dgit:3079
 msgid "no version available from the archive"
 msgstr ""
 
-#: ../dgit:3151
+#: ../dgit:3162
 msgid "dgit suite branch on dgit git server"
 msgstr ""
 
-#: ../dgit:3158
+#: ../dgit:3169
 msgid "dgit client's archive history view"
 msgstr ""
 
-#: ../dgit:3163
+#: ../dgit:3174
 msgid "Dgit field in .dsc from archive"
 msgstr ""
 
-#: ../dgit:3191
+#: ../dgit:3202
 #, perl-format
 msgid ""
 "\n"
@@ -671,15 +676,15 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:3204
+#: ../dgit:3215
 msgid "archive .dsc names newer git commit"
 msgstr ""
 
-#: ../dgit:3207
+#: ../dgit:3218
 msgid "archive .dsc names other git commit, fixing up"
 msgstr ""
 
-#: ../dgit:3228
+#: ../dgit:3239
 #, perl-format
 msgid ""
 "\n"
@@ -687,7 +692,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:3237
+#: ../dgit:3248
 #, perl-format
 msgid ""
 "\n"
@@ -697,7 +702,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3322
+#: ../dgit:3333
 #, perl-format
 msgid ""
 "Record %s (%s) in archive suite %s\n"
@@ -705,19 +710,19 @@ msgid ""
 "Record that\n"
 msgstr ""
 
-#: ../dgit:3335
+#: ../dgit:3346
 msgid "should be treated as descended from\n"
 msgstr ""
 
-#: ../dgit:3353
+#: ../dgit:3364
 msgid "dgit repo server tip (last push)"
 msgstr ""
 
-#: ../dgit:3355
+#: ../dgit:3366
 msgid "local tracking tip (last fetch)"
 msgstr ""
 
-#: ../dgit:3366
+#: ../dgit:3377
 #, perl-format
 msgid ""
 "\n"
@@ -727,30 +732,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3381
+#: ../dgit:3392
 msgid "fetched source tree"
 msgstr ""
 
-#: ../dgit:3417
+#: ../dgit:3428
 msgid "debian/changelog merge driver"
 msgstr ""
 
-#: ../dgit:3482
+#: ../dgit:3493
 msgid ""
 "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
 " not doing further gitattributes setup\n"
 msgstr ""
 
-#: ../dgit:3496
+#: ../dgit:3507
 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
 msgstr ""
 
-#: ../dgit:3511
+#: ../dgit:3522
 #, perl-format
 msgid "install %s: %s"
 msgstr ""
 
-#: ../dgit:3538
+#: ../dgit:3549
 #, perl-format
 msgid ""
 "dgit: warning: %s contains .gitattributes\n"
@@ -758,30 +763,30 @@ msgid ""
 "tree.\n"
 msgstr ""
 
-#: ../dgit:3560
+#: ../dgit:3571
 #, perl-format
 msgid "fetching %s..."
 msgstr ""
 
-#: ../dgit:3568
+#: ../dgit:3579
 #, perl-format
 msgid "failed to obtain %s: %s"
 msgstr ""
 
-#: ../dgit:3607
+#: ../dgit:3618
 #, perl-format
 msgid "package %s missing in (base suite) %s"
 msgstr ""
 
-#: ../dgit:3639
+#: ../dgit:3650
 msgid "local combined tracking branch"
 msgstr ""
 
-#: ../dgit:3641
+#: ../dgit:3652
 msgid "archive seems to have rewound: local tracking branch is ahead!"
 msgstr ""
 
-#: ../dgit:3680
+#: ../dgit:3691
 #, perl-format
 msgid ""
 "Combine archive branches %s [dgit]\n"
@@ -789,7 +794,7 @@ msgid ""
 "Input branches:\n"
 msgstr ""
 
-#: ../dgit:3694
+#: ../dgit:3705
 msgid ""
 "\n"
 "Key\n"
@@ -798,244 +803,248 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3709
+#: ../dgit:3720
 #, perl-format
 msgid "calculated combined tracking suite %s"
 msgstr ""
 
-#: ../dgit:3727
+#: ../dgit:3738
 #, perl-format
 msgid "ready for work in %s"
 msgstr ""
 
-#: ../dgit:3735
+#: ../dgit:3746
 msgid "dry run makes no sense with clone"
 msgstr ""
 
-#: ../dgit:3752
+#: ../dgit:3763
 #, perl-format
 msgid "create `%s': %s"
 msgstr ""
 
-#: ../dgit:3763
+#: ../dgit:3774
 msgid "fetching existing git history"
 msgstr ""
 
-#: ../dgit:3767
+#: ../dgit:3778
 msgid "starting new git history"
 msgstr ""
 
-#: ../dgit:3793
+#: ../dgit:3804
 #, perl-format
 msgid ""
 "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n"
 " Your vcs-git remote url may be out of date.  Use dgit update-vcs-git ?\n"
 msgstr ""
 
-#: ../dgit:3798
+#: ../dgit:3809
 #, perl-format
 msgid "fetched into %s"
 msgstr ""
 
-#: ../dgit:3810
+#: ../dgit:3821
 #, perl-format
 msgid "Merge from %s [dgit]"
 msgstr ""
 
-#: ../dgit:3812
+#: ../dgit:3823
 #, perl-format
 msgid "fetched to %s and merged into HEAD"
 msgstr ""
 
-#: ../dgit:3818
+#: ../dgit:3831
 #, perl-format
-msgid "git tree contains debian/source/%s"
+msgid "git tree contains %s"
 msgstr ""
 
-#: ../dgit:3837
+#: ../dgit:3842
+msgid "you have uncommitted changes to critical files, cannot continue:\n"
+msgstr ""
+
+#: ../dgit:3861
 #, perl-format
 msgid ""
 "quilt fixup required but quilt mode is `nofix'\n"
 "HEAD commit%s differs from tree implied by debian/patches%s"
 msgstr ""
 
-#: ../dgit:3854
+#: ../dgit:3878
 msgid "nothing quilty to commit, ok."
 msgstr ""
 
-#: ../dgit:3857
+#: ../dgit:3881
 msgid " (wanted to commit patch update)"
 msgstr ""
 
-#: ../dgit:3861
+#: ../dgit:3885
 msgid ""
 "Commit Debian 3.0 (quilt) metadata\n"
 "\n"
 msgstr ""
 
-#: ../dgit:3904
+#: ../dgit:3928
 #, perl-format
 msgid ""
 "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
 msgstr ""
 
-#: ../dgit:3909
+#: ../dgit:3933
 #, perl-format
 msgid "Format `%s', need to check/update patch stack"
 msgstr ""
 
-#: ../dgit:3919
+#: ../dgit:3943
 #, perl-format
 msgid "commit id %s"
 msgstr ""
 
-#: ../dgit:3925
+#: ../dgit:3949
 #, perl-format
 msgid "and left in %s"
 msgstr ""
 
-#: ../dgit:3951
+#: ../dgit:3975
 #, perl-format
 msgid "Wanted tag %s (%s) on dgit server, but not found\n"
 msgstr ""
 
-#: ../dgit:3954
+#: ../dgit:3978
 #, perl-format
 msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
 msgstr ""
 
-#: ../dgit:3962
+#: ../dgit:3986
 #, perl-format
 msgid "%s (%s) .. %s (%s) is not fast forward\n"
 msgstr ""
 
-#: ../dgit:3971
+#: ../dgit:3995
 msgid "version currently in archive"
 msgstr ""
 
-#: ../dgit:3980
+#: ../dgit:4004
 #, perl-format
 msgid "Checking package changelog for archive version %s ..."
 msgstr ""
 
-#: ../dgit:3988
+#: ../dgit:4012
 #, perl-format
 msgid "%s field from dpkg-parsechangelog %s"
 msgstr ""
 
-#: ../dgit:3998
+#: ../dgit:4022
 #, perl-format
 msgid "Perhaps debian/changelog does not mention %s ?"
 msgstr ""
 
-#: ../dgit:4001
+#: ../dgit:4025
 #, perl-format
 msgid ""
 "%s is %s\n"
 "Your tree seems to based on earlier (not uploaded) %s.\n"
 msgstr ""
 
-#: ../dgit:4015
+#: ../dgit:4039
 #, perl-format
-msgid "Declaring that HEAD inciudes all changes in %s..."
+msgid "Declaring that HEAD includes all changes in %s..."
 msgstr ""
 
-#: ../dgit:4071
-msgid "Checking that HEAD inciudes all changes in archive..."
+#: ../dgit:4095
+msgid "Checking that HEAD includes all changes in archive..."
 msgstr ""
 
-#: ../dgit:4080
+#: ../dgit:4104
 msgid "maintainer view tag"
 msgstr ""
 
-#: ../dgit:4082
+#: ../dgit:4106
 msgid "dgit view tag"
 msgstr ""
 
-#: ../dgit:4083
+#: ../dgit:4107
 msgid "current archive contents"
 msgstr ""
 
-#: ../dgit:4096
+#: ../dgit:4120
 msgid ""
 "| Not fast forward; maybe --overwrite is needed ?  Please see dgit(1).\n"
 msgstr ""
 
-#: ../dgit:4106
+#: ../dgit:4130
 #, perl-format
 msgid "Declare fast forward from %s\n"
 msgstr ""
 
-#: ../dgit:4107
+#: ../dgit:4131
 #, perl-format
 msgid "Make fast forward from %s\n"
 msgstr ""
 
-#: ../dgit:4111
+#: ../dgit:4135
 #, perl-format
 msgid "Made pseudo-merge of %s into dgit view."
 msgstr ""
 
-#: ../dgit:4124
+#: ../dgit:4148
 #, perl-format
 msgid "Declare fast forward from %s"
 msgstr ""
 
-#: ../dgit:4132
+#: ../dgit:4156
 #, perl-format
 msgid "Make pseudo-merge of %s into your HEAD."
 msgstr ""
 
-#: ../dgit:4144
+#: ../dgit:4168
 #, perl-format
 msgid "-p specified %s but changelog specified %s"
 msgstr ""
 
-#: ../dgit:4166
+#: ../dgit:4190
 #, perl-format
 msgid "%s is for %s %s but debian/changelog is for %s %s"
 msgstr ""
 
-#: ../dgit:4227
+#: ../dgit:4251
 #, perl-format
 msgid "changes field %s `%s' does not match changelog `%s'"
 msgstr ""
 
-#: ../dgit:4255
+#: ../dgit:4279
 #, perl-format
 msgid "%s release %s for %s (%s) [dgit]\n"
 msgstr ""
 
-#: ../dgit:4268
+#: ../dgit:4292
 #, perl-format
 msgid ""
 "%s release %s for %s (%s)\n"
 "(maintainer view tag generated by dgit --quilt=%s)\n"
 msgstr ""
 
-#: ../dgit:4320
+#: ../dgit:4344
 msgid ""
 "Push failed, while checking state of the archive.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 
-#: ../dgit:4329
+#: ../dgit:4353
 msgid ""
 "package appears to be new in this suite; if this is intentional, use --new"
 msgstr ""
 
-#: ../dgit:4334
+#: ../dgit:4358
 msgid ""
 "Push failed, while preparing your push.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 
-#: ../dgit:4357
+#: ../dgit:4381
 #, perl-format
 msgid "looked for .dsc %s, but %s; maybe you forgot to build"
 msgstr ""
 
-#: ../dgit:4374
+#: ../dgit:4398
 #, perl-format
 msgid ""
 "Branch is managed by git-debrebase (%s\n"
@@ -1044,14 +1053,14 @@ msgid ""
 "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
 msgstr ""
 
-#: ../dgit:4398
+#: ../dgit:4422
 #, perl-format
 msgid ""
 "--quilt=%s but no cached dgit view:\n"
 " perhaps HEAD changed since dgit build[-source] ?"
 msgstr ""
 
-#: ../dgit:4429
+#: ../dgit:4453
 msgid ""
 "dgit push: HEAD is not a descendant of the archive's version.\n"
 "To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
@@ -1059,24 +1068,24 @@ msgid ""
 "forward."
 msgstr ""
 
-#: ../dgit:4439
+#: ../dgit:4463
 #, perl-format
 msgid "checking that %s corresponds to HEAD"
 msgstr ""
 
-#: ../dgit:4473 ../dgit:4485
+#: ../dgit:4497 ../dgit:4509
 #, perl-format
 msgid "HEAD specifies a different tree to %s:\n"
 msgstr ""
 
-#: ../dgit:4479
+#: ../dgit:4503
 #, perl-format
 msgid ""
 "There is a problem with your source tree (see dgit(7) for some hints).\n"
 "To see a full diff, run git diff %s %s\n"
 msgstr ""
 
-#: ../dgit:4489
+#: ../dgit:4513
 #, perl-format
 msgid ""
 "Perhaps you forgot to build.  Or perhaps there is a problem with your\n"
@@ -1084,52 +1093,52 @@ msgid ""
 "   git diff %s %s\n"
 msgstr ""
 
-#: ../dgit:4500
+#: ../dgit:4524
 #, perl-format
 msgid ""
 "failed to find unique changes file (looked for %s in %s); perhaps you need "
 "to use dgit -C"
 msgstr ""
 
-#: ../dgit:4522
-msgid "uploading binaries, although distroy policy is source only"
+#: ../dgit:4546
+msgid "uploading binaries, although distro policy is source only"
 msgstr ""
 
-#: ../dgit:4526
-msgid "source-only upload, although distroy policy requires .debs"
+#: ../dgit:4550
+msgid "source-only upload, although distro policy requires .debs"
 msgstr ""
 
-#: ../dgit:4530
+#: ../dgit:4554
 #, perl-format
 msgid ""
 "source-only upload, even though package is entirely NEW\n"
 "(this is contrary to policy in %s)"
 msgstr ""
 
-#: ../dgit:4537
+#: ../dgit:4561
 #, perl-format
 msgid "unknown source-only-uploads policy `%s'"
 msgstr ""
 
-#: ../dgit:4581
+#: ../dgit:4605
 msgid ""
 "Push failed, while signing the tag.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 
-#: ../dgit:4594
+#: ../dgit:4618
 msgid ""
 "Push failed, *after* signing the tag.\n"
 "If you want to try again, you should use a new version number.\n"
 msgstr ""
 
-#: ../dgit:4611
+#: ../dgit:4635
 msgid ""
 "Push failed, while updating the remote git repository - see messages above.\n"
 "If you want to try again, you should use a new version number.\n"
 msgstr ""
 
-#: ../dgit:4628
+#: ../dgit:4652
 msgid ""
 "Push failed, while obtaining signatures on the .changes and .dsc.\n"
 "If it was just that the signature failed, you may try again by using\n"
@@ -1138,155 +1147,155 @@ msgid ""
 "If you need to change the package, you must use a new version number.\n"
 msgstr ""
 
-#: ../dgit:4659
+#: ../dgit:4683
 #, perl-format
 msgid "pushed and uploaded %s"
 msgstr ""
 
-#: ../dgit:4671
+#: ../dgit:4695
 msgid "-p is not allowed with clone; specify as argument instead"
 msgstr ""
 
-#: ../dgit:4682
+#: ../dgit:4706
 msgid "incorrect arguments to dgit clone"
 msgstr ""
 
-#: ../dgit:4688
+#: ../dgit:4712 ../git-debrebase:1839
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../dgit:4702
+#: ../dgit:4726
 #, perl-format
 msgid "remove %s: %s\n"
 msgstr ""
 
-#: ../dgit:4706
+#: ../dgit:4730
 #, perl-format
 msgid "check whether to remove %s: %s\n"
 msgstr ""
 
-#: ../dgit:4744
+#: ../dgit:4768
 msgid "incorrect arguments to dgit fetch or dgit pull"
 msgstr ""
 
-#: ../dgit:4761
+#: ../dgit:4785
 #, perl-format
 msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
 msgstr ""
 
-#: ../dgit:4770
+#: ../dgit:4794
 msgid "dgit checkout needs a suite argument"
 msgstr ""
 
-#: ../dgit:4832
+#: ../dgit:4856
 #, perl-format
 msgid "setting up vcs-git: %s\n"
 msgstr ""
 
-#: ../dgit:4835
+#: ../dgit:4859
 #, perl-format
 msgid "vcs git already configured: %s\n"
 msgstr ""
 
-#: ../dgit:4837
+#: ../dgit:4861
 #, perl-format
 msgid "changing vcs-git url to: %s\n"
 msgstr ""
 
-#: ../dgit:4842
+#: ../dgit:4866
 #, perl-format
 msgid "fetching (%s)\n"
 msgstr ""
 
-#: ../dgit:4857
+#: ../dgit:4881
 #, perl-format
 msgid "incorrect arguments to dgit %s"
 msgstr ""
 
-#: ../dgit:4868
+#: ../dgit:4892
 #, perl-format
 msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
 msgstr ""
 
-#: ../dgit:4906
+#: ../dgit:4930
 #, perl-format
 msgid ""
 "build host has dgit rpush protocol versions %s but invocation host has %s"
 msgstr ""
 
-#: ../dgit:4986
+#: ../dgit:5010
 #, perl-format
 msgid "create %s: %s"
 msgstr ""
 
-#: ../dgit:5023
+#: ../dgit:5047
 #, perl-format
 msgid "build host child failed: %s"
 msgstr ""
 
-#: ../dgit:5026
+#: ../dgit:5050
 msgid "all done\n"
 msgstr ""
 
-#: ../dgit:5035
+#: ../dgit:5059
 #, perl-format
 msgid "file %s (%s) twice"
 msgstr ""
 
-#: ../dgit:5043
+#: ../dgit:5067
 msgid "bad param spec"
 msgstr ""
 
-#: ../dgit:5049
+#: ../dgit:5073
 msgid "bad previously spec"
 msgstr ""
 
-#: ../dgit:5068
+#: ../dgit:5092
 #, perl-format
 msgid ""
 "rpush negotiated protocol version %s which does not support quilt mode %s"
 msgstr ""
 
-#: ../dgit:5113
+#: ../dgit:5137
 #, perl-format
 msgid "buildinfo mismatch in field %s"
 msgstr ""
 
-#: ../dgit:5116
+#: ../dgit:5140
 #, perl-format
 msgid "buildinfo contains forbidden field %s"
 msgstr ""
 
-#: ../dgit:5157
+#: ../dgit:5181
 msgid "remote changes file"
 msgstr ""
 
-#: ../dgit:5232
+#: ../dgit:5256
 msgid "not a plain file or symlink\n"
 msgstr ""
 
-#: ../dgit:5238
+#: ../dgit:5262
 msgid "mode or type changed\n"
 msgstr ""
 
-#: ../dgit:5239
+#: ../dgit:5263
 msgid "modified symlink\n"
 msgstr ""
 
-#: ../dgit:5242
+#: ../dgit:5266
 msgid "deletion of symlink\n"
 msgstr ""
 
-#: ../dgit:5246
+#: ../dgit:5270
 msgid "creation with non-default mode\n"
 msgstr ""
 
-#: ../dgit:5276
+#: ../dgit:5300
 msgid "dgit view: changes are required..."
 msgstr ""
 
-#: ../dgit:5305
+#: ../dgit:5329
 #, perl-format
 msgid ""
 "\n"
@@ -1294,31 +1303,31 @@ msgid ""
 " %s\n"
 msgstr ""
 
-#: ../dgit:5312
+#: ../dgit:5336
 #, perl-format
 msgid ""
 "--quilt=%s specified, implying patches-unapplied git tree\n"
 " but git tree differs from orig in upstream files."
 msgstr ""
 
-#: ../dgit:5318
+#: ../dgit:5342
 msgid ""
 "\n"
 " ... debian/patches is missing; perhaps this is a patch queue branch?"
 msgstr ""
 
-#: ../dgit:5325
+#: ../dgit:5349
 #, perl-format
 msgid ""
 "--quilt=%s specified, implying patches-applied git tree\n"
 " but git tree differs from result of applying debian/patches to upstream\n"
 msgstr ""
 
-#: ../dgit:5332
+#: ../dgit:5356
 msgid "dgit view: creating patches-applied version using gbp pq"
 msgstr ""
 
-#: ../dgit:5341
+#: ../dgit:5365
 #, perl-format
 msgid ""
 "--quilt=%s specified, implying that HEAD is for use with a\n"
@@ -1326,16 +1335,16 @@ msgid ""
 " .gitignores: but, such patches exist in debian/patches.\n"
 msgstr ""
 
-#: ../dgit:5350
+#: ../dgit:5374
 msgid "dgit view: creating patch to represent .gitignore changes"
 msgstr ""
 
-#: ../dgit:5355
+#: ../dgit:5379
 #, perl-format
 msgid "%s already exists; but want to create it to record .gitignore changes"
 msgstr ""
 
-#: ../dgit:5360
+#: ../dgit:5384
 msgid ""
 "Subject: Update .gitignore from Debian packaging branch\n"
 "\n"
@@ -1344,63 +1353,63 @@ msgid ""
 "updates to users of the official Debian archive view of the package.\n"
 msgstr ""
 
-#: ../dgit:5382
+#: ../dgit:5406
 msgid "Commit patch to update .gitignore\n"
 msgstr ""
 
-#: ../dgit:5396
+#: ../dgit:5420
 msgid "converted"
 msgstr ""
 
-#: ../dgit:5397
+#: ../dgit:5421
 #, perl-format
 msgid "dgit view: created (%s)"
 msgstr ""
 
-#: ../dgit:5462
+#: ../dgit:5486
 msgid "maximum search space exceeded"
 msgstr ""
 
-#: ../dgit:5480
+#: ../dgit:5504
 #, perl-format
 msgid "has %s not %s"
 msgstr ""
 
-#: ../dgit:5489
+#: ../dgit:5513
 msgid "root commit"
 msgstr ""
 
-#: ../dgit:5495
+#: ../dgit:5519
 #, perl-format
 msgid "merge (%s nontrivial parents)"
 msgstr ""
 
-#: ../dgit:5506
+#: ../dgit:5531
 #, perl-format
 msgid "changed %s"
 msgstr ""
 
-#: ../dgit:5525
+#: ../dgit:5550
 #, perl-format
 msgid ""
 "\n"
 "%s: error: quilt fixup cannot be linear.  Stopped at:\n"
 msgstr ""
 
-#: ../dgit:5532
+#: ../dgit:5557
 #, perl-format
 msgid "%s:  %s: %s\n"
 msgstr ""
 
-#: ../dgit:5544
+#: ../dgit:5569
 msgid "quilt history linearisation failed.  Search `quilt fixup' in dgit(7).\n"
 msgstr ""
 
-#: ../dgit:5547
+#: ../dgit:5572
 msgid "quilt fixup cannot be linear, smashing..."
 msgstr ""
 
-#: ../dgit:5559
+#: ../dgit:5584
 #, perl-format
 msgid ""
 "Automatically generated patch (%s)\n"
@@ -1408,68 +1417,68 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:5566
+#: ../dgit:5591
 msgid "quiltify linearisation planning successful, executing..."
 msgstr ""
 
-#: ../dgit:5600
+#: ../dgit:5625
 msgid "contains unexpected slashes\n"
 msgstr ""
 
-#: ../dgit:5601
+#: ../dgit:5626
 msgid "contains leading punctuation\n"
 msgstr ""
 
-#: ../dgit:5602
+#: ../dgit:5627
 msgid "contains bad character(s)\n"
 msgstr ""
 
-#: ../dgit:5603
+#: ../dgit:5628
 msgid "is series file\n"
 msgstr ""
 
-#: ../dgit:5604
+#: ../dgit:5629
 msgid "too long\n"
 msgstr ""
 
-#: ../dgit:5608
+#: ../dgit:5633
 #, perl-format
 msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
 msgstr ""
 
-#: ../dgit:5637
+#: ../dgit:5662
 #, perl-format
 msgid "dgit: patch title transliteration error: %s"
 msgstr ""
 
-#: ../dgit:5774
+#: ../dgit:5802
 msgid "Commit removal of .pc (quilt series tracking data)\n"
 msgstr ""
 
-#: ../dgit:5784
+#: ../dgit:5812
 msgid "starting quiltify (single-debian-patch)"
 msgstr ""
 
-#: ../dgit:5884
+#: ../dgit:5914
 #, perl-format
 msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
 msgstr ""
 
-#: ../dgit:5915
+#: ../dgit:5945
 #, perl-format
 msgid "dgit view: found cached (%s)"
 msgstr ""
 
-#: ../dgit:5920
+#: ../dgit:5950
 msgid "dgit view: found cached, no changes required"
 msgstr ""
 
-#: ../dgit:5931
+#: ../dgit:5961
 #, perl-format
 msgid "examining quilt state (multiple patches, %s mode)"
 msgstr ""
 
-#: ../dgit:6022
+#: ../dgit:6052
 msgid ""
 "failed to apply your git tree's patch stack (from debian/patches/) to\n"
 " the corresponding upstream tarball(s).  Your source tree and .orig\n"
@@ -1477,58 +1486,58 @@ msgid ""
 " anomaly (depending on the quilt mode).  Please see --quilt= in dgit(1).\n"
 msgstr ""
 
-#: ../dgit:6036
+#: ../dgit:6066
 msgid "Tree already contains .pc - will use it then delete it."
 msgstr ""
 
-#: ../dgit:6073
+#: ../dgit:6103
 #, perl-format
 msgid "%s: base trees orig=%.20s o+d/p=%.20s"
 msgstr ""
 
-#: ../dgit:6076
+#: ../dgit:6106
 #, perl-format
 msgid ""
 "%s: quilt differences: src:  %s orig %s     gitignores:  %s orig %s\n"
 "%s: quilt differences:      HEAD %s o+d/p               HEAD %s o+d/p"
 msgstr ""
 
-#: ../dgit:6082
+#: ../dgit:6112
 #, perl-format
 msgid "dgit:  cannot represent change: %s: %s\n"
 msgstr ""
 
-#: ../dgit:6086
+#: ../dgit:6116
 msgid ""
 "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
 msgstr ""
 
-#: ../dgit:6093
+#: ../dgit:6123
 msgid "This might be a patches-unapplied branch."
 msgstr ""
 
-#: ../dgit:6096
+#: ../dgit:6126
 msgid "This might be a patches-applied branch."
 msgstr ""
 
-#: ../dgit:6099
+#: ../dgit:6129
 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
 msgstr ""
 
-#: ../dgit:6102
+#: ../dgit:6132
 msgid "Warning: Tree has .gitattributes.  See GITATTRIBUTES in dgit(7)."
 msgstr ""
 
-#: ../dgit:6106
+#: ../dgit:6136
 msgid "Maybe orig tarball(s) are not identical to git representation?"
 msgstr ""
 
-#: ../dgit:6115
+#: ../dgit:6145
 #, perl-format
 msgid "starting quiltify (multiple patches, %s mode)"
 msgstr ""
 
-#: ../dgit:6153
+#: ../dgit:6183
 msgid ""
 "\n"
 "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@ -1537,81 +1546,98 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:6165
+#: ../dgit:6195
 msgid "dgit: Unapplying patches again to tidy up the tree."
 msgstr ""
 
-#: ../dgit:6199
+#: ../dgit:6223
+#, perl-format
+msgid ""
+"%s\n"
+"If this is just missing .gitignore entries, use a different clean\n"
+"mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\n"
+"or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
+msgstr ""
+
+#: ../dgit:6237
 msgid "tree contains uncommitted files and --clean=check specified"
 msgstr ""
 
-#: ../dgit:6208
+#: ../dgit:6240
+msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
+msgstr ""
+
+#: ../dgit:6261
+msgid "tree contains uncommitted files (after running rules clean)"
+msgstr ""
+
+#: ../dgit:6275
 msgid "clean takes no additional arguments"
 msgstr ""
 
-#: ../dgit:6221
+#: ../dgit:6288
 #, perl-format
 msgid "-p is not allowed with dgit %s"
 msgstr ""
 
-#: ../dgit:6248
+#: ../dgit:6324
 #, perl-format
 msgid "remove old changes file %s: %s"
 msgstr ""
 
-#: ../dgit:6250
+#: ../dgit:6326
 #, perl-format
 msgid "would remove %s"
 msgstr ""
 
-#: ../dgit:6276
+#: ../dgit:6352
 msgid "archive query failed (queried because --since-version not specified)"
 msgstr ""
 
-#: ../dgit:6282
+#: ../dgit:6358
 #, perl-format
 msgid "changelog will contain changes since %s"
 msgstr ""
 
-#: ../dgit:6285
+#: ../dgit:6361
 msgid "package seems new, not specifying -v<version>"
 msgstr ""
 
-#: ../dgit:6328
+#: ../dgit:6404
 msgid "Wanted to build nothing!"
 msgstr ""
 
-#: ../dgit:6366
+#: ../dgit:6442
 #, perl-format
 msgid "only one changes file from build (%s)\n"
 msgstr ""
 
-#: ../dgit:6373
+#: ../dgit:6449
 #, perl-format
 msgid "%s found in binaries changes file %s"
 msgstr ""
 
-#: ../dgit:6380
+#: ../dgit:6456
 #, perl-format
 msgid "%s unexpectedly not created by build"
 msgstr ""
 
-#: ../dgit:6384
+#: ../dgit:6460
 #, perl-format
 msgid "install new changes %s{,.inmulti}: %s"
 msgstr ""
 
-#: ../dgit:6389
+#: ../dgit:6465
 #, perl-format
 msgid "wrong number of different changes files (%s)"
 msgstr ""
 
-#: ../dgit:6392
+#: ../dgit:6468
 #, perl-format
 msgid "build successful, results in %s\n"
 msgstr ""
 
-#: ../dgit:6405
+#: ../dgit:6481
 #, perl-format
 msgid ""
 "changes files other than source matching %s already present; building would "
@@ -1619,154 +1645,158 @@ msgid ""
 "Suggest you delete %s.\n"
 msgstr ""
 
-#: ../dgit:6423
+#: ../dgit:6499
 msgid "build successful\n"
 msgstr ""
 
-#: ../dgit:6430
+#: ../dgit:6506
 #, perl-format
 msgid ""
 "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n"
 "%s: warning: build-products-dir will be ignored; files will go to ..\n"
 msgstr ""
 
-#: ../dgit:6542
+#: ../dgit:6616
 #, perl-format
 msgid "remove %s: %s"
 msgstr ""
 
-#: ../dgit:6579
+#: ../dgit:6651
+msgid "--include-dirty not supported with --build-products-dir, sorry"
+msgstr ""
+
+#: ../dgit:6671
 #, perl-format
 msgid "put in place new built file (%s): %s"
 msgstr ""
 
-#: ../dgit:6592
+#: ../dgit:6684
 msgid "build-source takes no additional arguments"
 msgstr ""
 
-#: ../dgit:6596
+#: ../dgit:6688
 #, perl-format
 msgid "source built, results in %s and %s"
 msgstr ""
 
-#: ../dgit:6603
+#: ../dgit:6695
 msgid ""
 "dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
 "push-source!"
 msgstr ""
 
-#: ../dgit:6609
+#: ../dgit:6701
 msgid "source changes file"
 msgstr ""
 
-#: ../dgit:6611
+#: ../dgit:6703
 msgid "user-specified changes file is not source-only"
 msgstr ""
 
-#: ../dgit:6631 ../dgit:6633
+#: ../dgit:6723 ../dgit:6725
 #, perl-format
 msgid "%s (in build products dir): %s"
 msgstr ""
 
-#: ../dgit:6646
+#: ../dgit:6738
 msgid ""
 "perhaps you need to pass -A ?  (sbuild's default is to build only\n"
 "arch-specific binaries; dgit 1.4 used to override that.)\n"
 msgstr ""
 
-#: ../dgit:6658
+#: ../dgit:6750
 msgid ""
 "you asked for a builder but your debbuildopts didn't ask for any binaries -- "
 "is this really what you meant?"
 msgstr ""
 
-#: ../dgit:6662
+#: ../dgit:6754
 msgid ""
 "we must build a .dsc to pass to the builder but your debbuiltopts forbids "
 "the building of a source package; cannot continue"
 msgstr ""
 
-#: ../dgit:6692
+#: ../dgit:6784
 msgid "incorrect arguments to dgit print-unapplied-treeish"
 msgstr ""
 
-#: ../dgit:6714
+#: ../dgit:6806
 msgid "source tree"
 msgstr ""
 
-#: ../dgit:6716
+#: ../dgit:6808
 #, perl-format
 msgid "dgit: import-dsc: %s"
 msgstr ""
 
-#: ../dgit:6729
+#: ../dgit:6821
 #, perl-format
 msgid "unknown dgit import-dsc sub-option `%s'"
 msgstr ""
 
-#: ../dgit:6733
+#: ../dgit:6825
 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
 msgstr ""
 
-#: ../dgit:6737
+#: ../dgit:6829
 msgid "dry run makes no sense with import-dsc"
 msgstr ""
 
-#: ../dgit:6754
+#: ../dgit:6846
 #, perl-format
 msgid "%s is checked out - will not update it"
 msgstr ""
 
-#: ../dgit:6759
+#: ../dgit:6851
 #, perl-format
 msgid "open import .dsc (%s): %s"
 msgstr ""
 
-#: ../dgit:6761
+#: ../dgit:6853
 #, perl-format
 msgid "read %s: %s"
 msgstr ""
 
-#: ../dgit:6772
+#: ../dgit:6864
 msgid "import-dsc signature check failed"
 msgstr ""
 
-#: ../dgit:6775
+#: ../dgit:6867
 #, perl-format
 msgid "%s: warning: importing unsigned .dsc\n"
 msgstr ""
 
-#: ../dgit:6786
+#: ../dgit:6878
 msgid "Dgit metadata in .dsc"
 msgstr ""
 
-#: ../dgit:6797
+#: ../dgit:6889
 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
 msgstr ""
 
-#: ../dgit:6806
+#: ../dgit:6898
 #, perl-format
 msgid ""
 ".dsc contains Dgit field referring to object %s\n"
 "Your git tree does not have that object.  Try `git fetch' from a\n"
-"plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.\n"
+"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
 msgstr ""
 
-#: ../dgit:6813
+#: ../dgit:6905
 msgid "Not fast forward, forced update."
 msgstr ""
 
-#: ../dgit:6815
+#: ../dgit:6907
 #, perl-format
 msgid "Not fast forward to %s"
 msgstr ""
 
-#: ../dgit:6820
+#: ../dgit:6912
 #, perl-format
 msgid "updated git ref %s"
 msgstr ""
 
-#: ../dgit:6825
+#: ../dgit:6917
 #, perl-format
 msgid ""
 "Branch %s already exists\n"
@@ -1774,197 +1804,864 @@ msgid ""
 "Specify  +%s to overwrite, discarding existing history\n"
 msgstr ""
 
-#: ../dgit:6837
+#: ../dgit:6929
 #, perl-format
 msgid "lstat %s works but stat gives %s !"
 msgstr ""
 
-#: ../dgit:6839
+#: ../dgit:6931
 #, perl-format
 msgid "stat %s: %s"
 msgstr ""
 
-#: ../dgit:6847
+#: ../dgit:6939
 #, perl-format
 msgid "cannot import %s which seems to be inside working tree!"
 msgstr ""
 
-#: ../dgit:6851
+#: ../dgit:6943
 #, perl-format
 msgid "import %s requires .../%s, but it does not exist"
 msgstr ""
 
-#: ../dgit:6856
+#: ../dgit:6948
 #, perl-format
 msgid "import %s requires %s, but: %s"
 msgstr ""
 
-#: ../dgit:6858
+#: ../dgit:6950
 #, perl-format
 msgid "symlink %s to %s: %s"
 msgstr ""
 
-#: ../dgit:6859
+#: ../dgit:6951
 #, perl-format
 msgid "made symlink %s -> %s"
 msgstr ""
 
-#: ../dgit:6870
+#: ../dgit:6962
 msgid "Import, forced update - synthetic orphan git history."
 msgstr ""
 
-#: ../dgit:6872
+#: ../dgit:6964
 msgid "Import, merging."
 msgstr ""
 
-#: ../dgit:6886
+#: ../dgit:6978
 #, perl-format
 msgid "Merge %s (%s) import into %s\n"
 msgstr ""
 
-#: ../dgit:6895
+#: ../dgit:6987
 #, perl-format
-msgid "results are in in git ref %s"
+msgid "results are in git ref %s"
 msgstr ""
 
-#: ../dgit:6902
+#: ../dgit:6994
 msgid "need only 1 subpath argument"
 msgstr ""
 
-#: ../dgit:6908
+#: ../dgit:7000
 #, perl-format
 msgid "exec curl: %s\n"
 msgstr ""
 
-#: ../dgit:6922
+#: ../dgit:7014
 msgid "need destination argument"
 msgstr ""
 
-#: ../dgit:6927
+#: ../dgit:7019
 #, perl-format
 msgid "exec git clone: %s\n"
 msgstr ""
 
-#: ../dgit:6935
+#: ../dgit:7027
 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
 msgstr ""
 
-#: ../dgit:6946
+#: ../dgit:7038
 msgid "no arguments allowed to dgit print-dpkg-source-ignores"
 msgstr ""
 
-#: ../dgit:6952
+#: ../dgit:7044
 msgid "no arguments allowed to dgit setup-mergechangelogs"
 msgstr ""
 
-#: ../dgit:6959 ../dgit:6965
+#: ../dgit:7051 ../dgit:7057
 msgid "no arguments allowed to dgit setup-useremail"
 msgstr ""
 
-#: ../dgit:6971
+#: ../dgit:7063
 msgid "no arguments allowed to dgit setup-tree"
 msgstr ""
 
-#: ../dgit:7018
+#: ../dgit:7110
 msgid ""
 "--initiator-tempdir must be used specify an absolute, not relative, "
 "directory."
 msgstr ""
 
-#: ../dgit:7057
+#: ../dgit:7149
 #, perl-format
 msgid "%s needs a value"
 msgstr ""
 
-#: ../dgit:7061
+#: ../dgit:7153
 #, perl-format
 msgid "bad value `%s' for %s"
 msgstr ""
 
-#: ../dgit:7146
+#: ../dgit:7238
 #, perl-format
 msgid "%s: warning: ignoring unknown force option %s\n"
 msgstr ""
 
-#: ../dgit:7166
+#: ../dgit:7258
 #, perl-format
 msgid "unknown long option `%s'"
 msgstr ""
 
-#: ../dgit:7219
+#: ../dgit:7314
 #, perl-format
 msgid "unknown short option `%s'"
 msgstr ""
 
-#: ../dgit:7234
+#: ../dgit:7329
 #, perl-format
 msgid "%s is set to something other than SIG_DFL\n"
 msgstr ""
 
-#: ../dgit:7238
+#: ../dgit:7333
 #, perl-format
 msgid "%s is blocked\n"
 msgstr ""
 
-#: ../dgit:7244
+#: ../dgit:7339
 #, perl-format
 msgid ""
 "On entry to dgit, %s\n"
-"This is a bug produced by something in in your execution environment.\n"
+"This is a bug produced by something in your execution environment.\n"
 "Giving up.\n"
 msgstr ""
 
-#: ../dgit:7261
+#: ../dgit:7356
 #, perl-format
 msgid "cannot set command for %s"
 msgstr ""
 
-#: ../dgit:7274
+#: ../dgit:7369
 #, perl-format
 msgid "cannot configure options for %s"
 msgstr ""
 
-#: ../dgit:7294
+#: ../dgit:7389
 #, perl-format
 msgid "unknown quilt-mode `%s'"
 msgstr ""
 
-#: ../dgit:7304
+#: ../dgit:7399
 #, perl-format
 msgid "unknown %s setting `%s'"
 msgstr ""
 
-#: ../dgit:7309
+#: ../dgit:7404
 msgid "dgit: --include-dirty is not supported in split view quilt mode"
 msgstr ""
 
-#: ../dgit:7317
+#: ../dgit:7415
 #, perl-format
 msgid "unknown clean-mode `%s'"
 msgstr ""
 
-#: ../dgit:7338
+#: ../dgit:7436
 msgid "DRY RUN ONLY\n"
 msgstr ""
 
-#: ../dgit:7339
+#: ../dgit:7437
 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
 msgstr ""
 
-#: ../dgit:7355
+#: ../dgit:7456
 #, perl-format
 msgid "unknown operation %s"
 msgstr ""
 
-#: ../git-debrebase:2069
+#: ../git-debrebase:44
+msgid ""
+"usages:\n"
+"  git-debrebase [<options>] [--|-i <git rebase options...>]\n"
+"  git-debrebase [<options>] status\n"
+"  git-debrebase [<options>] prepush [--prose=...]\n"
+"  git-debrebase [<options>] quick|conclude\n"
+"  git-debrebase [<options>] new-upstream <new-version> [<details ...>]\n"
+"  git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]\n"
+"  ...\n"
+"See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
+msgstr ""
+
+#: ../git-debrebase:67
+#, perl-format
+msgid "%s: bad usage: %s\n"
+msgstr ""
+
+#: ../git-debrebase:78
+#, perl-format
+msgid "bad options follow `git-debrebase %s'"
+msgstr ""
+
+#: ../git-debrebase:89
+#, perl-format
+msgid "missing required git config %s"
+msgstr ""
+
+#: ../git-debrebase:401
+#, perl-format
+msgid "%s: snag ignored (-f%s): %s\n"
+msgstr ""
+
+#: ../git-debrebase:404
+#, perl-format
+msgid "%s: snag detected (-f%s): %s\n"
+msgstr ""
+
+#: ../git-debrebase:417
+#, perl-format
+msgid "%s: snags: %d overriden by individual -f options\n"
+msgstr ""
+
+#: ../git-debrebase:423
+#, perl-format
+msgid "%s: snags: %d overriden by global --force\n"
+msgstr ""
+
+#: ../git-debrebase:427
+#, perl-format
+msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
+msgstr ""
+
+#: ../git-debrebase:459
+msgid ""
+"Branch/history seems mangled - no longer in gdr format.\n"
+"See ILLEGAL OPERATIONS in git-debrebase(5).\n"
+msgstr ""
+
+#: ../git-debrebase:466
+#, perl-format
+msgid ""
+"%s\n"
+"Is this meant to be a gdr branch?  %s\n"
+msgstr ""
+
+#: ../git-debrebase:471
+#, perl-format
+msgid ""
+"%s\n"
+"%s\n"
+"Consider git-debrebase scrap, to throw away your recent work.\n"
+msgstr ""
+
+#: ../git-debrebase:477
+#, perl-format
+msgid ""
+"%s\n"
+"Branch does not seem to be meant to be a git-debrebase branch?\n"
+"Wrong branch, or maybe you needed git-debrebase convert-from-*.\n"
+msgstr ""
+
+#: ../git-debrebase:488
+#, perl-format
+msgid ""
+"%s\n"
+"Branch/history mangled, and diverged since last git-debrebase.\n"
+"Maybe you reset to, or rebased from, somewhere inappropriate.\n"
+msgstr ""
+
+#: ../git-debrebase:935
+#, perl-format
+msgid "git-debrebase `anchor' but %s"
+msgstr ""
+
+#: ../git-debrebase:937
+msgid "has other than two parents"
+msgstr ""
+
+#: ../git-debrebase:938
+msgid "contains debian/patches"
+msgstr ""
+
+#: ../git-debrebase:964
+msgid "is an origin commit"
+msgstr ""
+
+#: ../git-debrebase:966
+msgid "upstream files differ from left parent"
+msgstr ""
+
+#: ../git-debrebase:968
+msgid "debian/ differs from right parent"
+msgstr ""
+
+#: ../git-debrebase:979
+msgid "edits debian/patches"
+msgstr ""
+
+#: ../git-debrebase:991
+msgid "parent's debian is not a directory"
+msgstr ""
+
+#: ../git-debrebase:998
+msgid "no changes"
+msgstr ""
+
+#: ../git-debrebase:1004
+msgid "origin commit"
+msgstr ""
+
+#: ../git-debrebase:1055
+#, perl-format
+msgid "unknown kind of merge from %s"
+msgstr ""
+
+#: ../git-debrebase:1058
+msgid "octopus merge"
+msgstr ""
+
+#: ../git-debrebase:1062
+msgid "general two-parent merge"
+msgstr ""
+
+#: ../git-debrebase:1079
+#, perl-format
+msgid "inconsistent anchors in merged-breakwaters %s"
+msgstr ""
+
+#: ../git-debrebase:1119
+#, perl-format
+msgid "branch needs laundering (run git-debrebase): %s"
+msgstr ""
+
+#: ../git-debrebase:1147
+#, perl-format
+msgid "packaging change (%s) follows upstream change"
+msgstr ""
+
+#: ../git-debrebase:1148
+#, perl-format
+msgid " (eg %s)"
+msgstr ""
+
+#: ../git-debrebase:1154
+msgid "found mixed upstream/packaging commit"
+msgstr ""
+
+#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168
+#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187
+#, perl-format
+msgid " (%s)"
+msgstr ""
+
+#: ../git-debrebase:1162
+#, perl-format
+msgid "found interchange bureaucracy commit (%s)"
+msgstr ""
+
+#: ../git-debrebase:1167
+msgid "found dgit dsc import"
+msgstr ""
+
+#: ../git-debrebase:1172
+msgid "found bare dgit dsc import with no prior history"
+msgstr ""
+
+#: ../git-debrebase:1178
+msgid "found vanilla merge"
+msgstr ""
+
+#: ../git-debrebase:1185
+#, perl-format
+msgid "found unprocessable commit, cannot cope: %s"
+msgstr ""
+
+#: ../git-debrebase:1253
+#, perl-format
+msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
+msgstr ""
+
+#: ../git-debrebase:1254
+#, perl-format
+msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
+msgstr ""
+
+#: ../git-debrebase:1375
+msgid "bare dgit dsc import"
+msgstr ""
+
+#: ../git-debrebase:1715 ../git-debrebase:1718
+#, perl-format
+msgid "mismatch %s ?"
+msgstr ""
+
+#: ../git-debrebase:1721
+#, perl-format
+msgid "mismatch %s != %s ?"
+msgstr ""
+
+#: ../git-debrebase:1731
+#, perl-format
+msgid "internal error %#x %s %s"
+msgstr ""
+
+#: ../git-debrebase:1759
+#, perl-format
+msgid "%s: laundered (head was %s)\n"
+msgstr ""
+
+#: ../git-debrebase:1773
+msgid "you are in the middle of a git-rebase already"
+msgstr ""
+
+#: ../git-debrebase:1799
+msgid "launder for rebase"
+msgstr ""
+
+#: ../git-debrebase:1804
+msgid "analyse does not support any options"
+msgstr ""
+
+#: ../git-debrebase:1806
+msgid "too many arguments to analyse"
+msgstr ""
+
+#: ../git-debrebase:1841
+msgid "HEAD symref is not to refs/heads/"
+msgstr ""
+
+#: ../git-debrebase:1864
+#, perl-format
+msgid "OK, you are ahead of %s\n"
+msgstr ""
+
+#: ../git-debrebase:1868
+#, perl-format
+msgid "you are behind %s, divergence risk"
+msgstr ""
+
+#: ../git-debrebase:1872
+#, perl-format
+msgid "you have diverged from %s"
+msgstr ""
+
+#: ../git-debrebase:1894
+msgid "remote dgit branch"
+msgstr ""
+
+#: ../git-debrebase:1897
+msgid "remote dgit branch for sid"
+msgstr ""
+
+#: ../git-debrebase:1925
+msgid "Recorded previous head for preservation"
+msgstr ""
+
+#: ../git-debrebase:1933
+#, perl-format
+msgid "could not record ffq-prev: %s"
+msgstr ""
+
+#: ../git-debrebase:1944
+#, perl-format
+msgid "could not check ffq-prev: %s"
+msgstr ""
+
+#: ../git-debrebase:1964
+msgid "fast forward"
+msgstr ""
+
+#: ../git-debrebase:1974
+msgid "Declare fast forward / record previous work"
+msgstr ""
+
+#: ../git-debrebase:1986
+msgid "No ffq-prev to stitch."
+msgstr ""
+
+#: ../git-debrebase:2016
+#, perl-format
+msgid ""
+"Could not determine appropriate upstream commitish.\n"
+" (Tried these tags: %s)\n"
+" Check version, and specify upstream commitish explicitly."
+msgstr ""
+
+#: ../git-debrebase:2033
+msgid "need NEW-VERSION [UPS-COMMITTISH]"
+msgstr ""
+
+#: ../git-debrebase:2038
+#, perl-format
+msgid "bad version number `%s'"
+msgstr ""
+
+#: ../git-debrebase:2055
+#, perl-format
+msgid "upstream piece `%s'"
+msgstr ""
+
+#: ../git-debrebase:2056
+msgid "upstream (main piece"
+msgstr ""
+
+#: ../git-debrebase:2076
+msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
+msgstr ""
+
+#: ../git-debrebase:2094
 msgid "old anchor is recognised due to --anchor, cannot check upstream"
 msgstr ""
 
-#: ../git-debrebase:2980
-msgid "git-debrebase: no cuddling to -i for git-rebase"
+#: ../git-debrebase:2110
+#, perl-format
+msgid ""
+"previous upstream combine %s mentions %d pieces (each implying one parent) "
+"but has %d parents (one per piece plus maybe a previous combine)"
+msgstr ""
+
+#: ../git-debrebase:2119
+#, perl-format
+msgid "previous upstream combine %s first piece is not `.'"
+msgstr ""
+
+#: ../git-debrebase:2132
+#, perl-format
+msgid ""
+"previous upstream %s is from git-debrebase but not an `upstream-combine' "
+"commit"
+msgstr ""
+
+#: ../git-debrebase:2143
+#, perl-format
+msgid "introducing upstream piece `%s'"
+msgstr ""
+
+#: ../git-debrebase:2146
+#, perl-format
+msgid "dropping upstream piece `%s'"
+msgstr ""
+
+#: ../git-debrebase:2149
+#, perl-format
+msgid "not fast forward: %s %s"
+msgstr ""
+
+#: ../git-debrebase:2260
+msgid "Previous head already recorded\n"
+msgstr ""
+
+#: ../git-debrebase:2264
+#, perl-format
+msgid "Could not preserve: %s"
+msgstr ""
+
+#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281
+#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404
+#: ../git-debrebase:2468
+msgid "no arguments allowed"
+msgstr ""
+
+#: ../git-debrebase:2303
+msgid "branch contains furniture (not laundered)"
+msgstr ""
+
+#: ../git-debrebase:2304
+msgid "branch is unlaundered"
+msgstr ""
+
+#: ../git-debrebase:2305
+msgid "branch needs laundering"
 msgstr ""
 
-#: ../git-debrebase:3011
+#: ../git-debrebase:2306
+msgid "branch not in git-debrebase form"
+msgstr ""
+
+#: ../git-debrebase:2316
+msgid "current branch contents, in git-debrebase terms:\n"
+msgstr ""
+
+#: ../git-debrebase:2318
+msgid "  branch is laundered\n"
+msgstr ""
+
+#: ../git-debrebase:2334
+#, perl-format
+msgid "  %s is not well-defined\n"
+msgstr ""
+
+#: ../git-debrebase:2340
+msgid "key git-debrebase commits:\n"
+msgstr ""
+
+#: ../git-debrebase:2341
+msgid "anchor"
+msgstr ""
+
+#: ../git-debrebase:2342
+msgid "breakwater"
+msgstr ""
+
+#: ../git-debrebase:2347
+msgid "branch and ref status, in git-debrebase terms:\n"
+msgstr ""
+
+#: ../git-debrebase:2354
+msgid "  unstitched; previous tip was:\n"
+msgstr ""
+
+#: ../git-debrebase:2357
+msgid "  stitched? (no record of git-debrebase work)\n"
+msgstr ""
+
+#: ../git-debrebase:2359
+msgid "  stitched\n"
+msgstr ""
+
+#: ../git-debrebase:2361
+msgid "  not git-debrebase (diverged since last stitch)\n"
+msgstr ""
+
+#: ../git-debrebase:2364
+msgid "you are currently rebasing\n"
+msgstr ""
+
+#: ../git-debrebase:2381 ../git-debrebase:2394
+msgid "launder for git-debrebase quick"
+msgstr ""
+
+#: ../git-debrebase:2388 ../git-debrebase:2418
+msgid "No ongoing git-debrebase session."
+msgstr ""
+
+#: ../git-debrebase:2457
+msgid "Commit patch queue (exported by git-debrebase)"
+msgstr ""
+
+#: ../git-debrebase:2474
+msgid "No (more) patches to export."
+msgstr ""
+
+#: ../git-debrebase:2481
+#, perl-format
+msgid ""
+"Patch export produced patch amendments (abandoned output commit %s).  Try "
+"laundering first."
+msgstr ""
+
+#: ../git-debrebase:2501
+#, perl-format
+msgid "%s contains comments, which will be discarded"
+msgstr ""
+
+#: ../git-debrebase:2506
+#, perl-format
+msgid "patch %s repeated in %s !"
+msgstr ""
+
+#: ../git-debrebase:2513
+#, perl-format
+msgid "Unused patch file %s will be discarded"
+msgstr ""
+
+#: ../git-debrebase:2521
+msgid "ffq-prev exists, this is already managed by git-debrebase!"
+msgstr ""
+
+#: ../git-debrebase:2526
+msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
+msgstr ""
+
+#: ../git-debrebase:2541
+msgid "want only 1 optional argument, the upstream git commitish"
+msgstr ""
+
+#: ../git-debrebase:2546
+msgid "missing Version from changelog\n"
+msgstr ""
+
+#: ../git-debrebase:2562
+#, perl-format
+msgid ""
+"upstream (%s) and HEAD are not\n"
+"identical in upstream files.  See diffstat above, or run\n"
+"  git diff %s HEAD -- :!/debian :/\n"
+msgstr ""
+
+#: ../git-debrebase:2570
+#, perl-format
+msgid "upstream (%s) is not an ancestor of HEAD"
+msgstr ""
+
+#: ../git-debrebase:2577
+#, perl-format
+msgid ""
+"history between upstream (%s) and HEAD contains direct changes to upstream "
+"files - are you sure this is a gbp (patches-unapplied) branch?"
+msgstr ""
+
+#: ../git-debrebase:2579
+#, perl-format
+msgid "list expected changes with:  %s\n"
+msgstr ""
+
+#: ../git-debrebase:2586
+#, perl-format
+msgid "upstream (%s) contains debian/ directory"
+msgstr ""
+
+#: ../git-debrebase:2604
+msgid "neither of the first two changelog entries are released\n"
+msgstr ""
+
+#: ../git-debrebase:2610
+#, perl-format
+msgid "could not find suitable maintainer view tag %s\n"
+msgstr ""
+
+#: ../git-debrebase:2613
+#, perl-format
+msgid "HEAD is not FF from maintainer tag %s!"
+msgstr ""
+
+#: ../git-debrebase:2616
+#, perl-format
+msgid "dgit view tag %s not found\n"
+msgstr ""
+
+#: ../git-debrebase:2618
+#, perl-format
+msgid "dgit view tag %s is not FF from maintainer tag %s\n"
+msgstr ""
+
+#: ../git-debrebase:2620
+#, perl-format
+msgid "will stitch in dgit view, %s\n"
+msgstr ""
+
+#: ../git-debrebase:2627
+#, perl-format
+msgid ""
+"Cannot confirm dgit view: %s\n"
+"Failed to stitch in dgit view (see messages above).\n"
+"dgit --overwrite will be needed on the first dgit push after conversion.\n"
+msgstr ""
+
+#: ../git-debrebase:2673
+#, perl-format
+msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
+msgstr ""
+
+#: ../git-debrebase:2702
+#, perl-format
+msgid ""
+"%s: converted to git-buildpackage branch format\n"
+"%s: WARNING: do not now run \"git-debrebase\" any more\n"
+"%s: WARNING: doing so would drop all upstream patches!\n"
+msgstr ""
+
+#: ../git-debrebase:2723
+msgid "takes 1 optional argument, the upstream commitish"
+msgstr ""
+
+#: ../git-debrebase:2731
+#, perl-format
+msgid "%s, from command line"
+msgstr ""
+
+#: ../git-debrebase:2745
+#, perl-format
+msgid ""
+"%s: Branch already seems to be in git-debrebase format!\n"
+"%s: --always-convert-anyway would do the conversion operation anyway\n"
+"%s: but is probably a bad idea.  Probably, you wanted to do nothing.\n"
+msgstr ""
+
+#: ../git-debrebase:2749
+msgid "Branch already in git-debrebase format."
+msgstr ""
+
+#: ../git-debrebase:2761
+msgid "Considering possible commits corresponding to upstream:\n"
+msgstr ""
+
+#: ../git-debrebase:2768
+#, perl-format
+msgid "git tag %s"
+msgstr ""
+
+#: ../git-debrebase:2774
+#, perl-format
+msgid " git tag: no suitable tag found (tried %s)\n"
+msgstr ""
+
+#: ../git-debrebase:2783
+#, perl-format
+msgid "opendir build-products-dir %s: %s"
+msgstr ""
+
+#: ../git-debrebase:2789
+#, perl-format
+msgid " orig: found what looks like a .orig, %s\n"
+msgstr ""
+
+#: ../git-debrebase:2820
+#, perl-format
+msgid " orig: no suitable origs found (looked for %s in %s)\n"
+msgstr ""
+
+#: ../git-debrebase:2829
+msgid "Evaluating possible commits corresponding to upstream:\n"
+msgstr ""
+
+#: ../git-debrebase:2866
+#, perl-format
+msgid " %s: couldn't apply patches: gbp pq %s"
+msgstr ""
+
+#: ../git-debrebase:2875
+#, perl-format
+msgid " %s: applying patches gives different tree\n"
+msgstr ""
+
+#: ../git-debrebase:2889
+msgid ""
+"Could not find or construct a suitable upstream commit.\n"
+"Rerun adding --diagnose after convert-from-dgit-view, or pass a\n"
+"upstream commmit explicitly or provide suitable origs.\n"
+msgstr ""
+
+#: ../git-debrebase:2895
+#, perl-format
+msgid "Yes, will base new branch on %s\n"
+msgstr ""
+
+#: ../git-debrebase:2902
+msgid "forget-was-ever-debrebase takes no further arguments"
+msgstr ""
+
+#: ../git-debrebase:2906
+#, perl-format
+msgid "Not suitable for recording git-debrebaseness anyway: %s"
+msgstr ""
+
+#: ../git-debrebase:3008
+msgid "bad options\n"
+msgstr ""
+
+#: ../git-debrebase:3018
+#, perl-format
+msgid "%s: no cuddling to -i for git-rebase"
+msgstr ""
+
+#: ../git-debrebase:3048
 #, perl-format
 msgid "unknown git-debrebase sub-operation %s"
 msgstr ""
@@ -2016,64 +2713,96 @@ msgstr ""
 msgid "subprocess produced invalid output"
 msgstr ""
 
-#: ../Debian/Dgit.pm:544
+#: ../Debian/Dgit.pm:450
+msgid "stat source file: %S"
+msgstr ""
+
+#: ../Debian/Dgit.pm:460
+msgid "stat destination file: %S"
+msgstr ""
+
+#: ../Debian/Dgit.pm:479
+msgid "finally install file after cp: %S"
+msgstr ""
+
+#: ../Debian/Dgit.pm:485
+msgid "delete old file after cp: %S"
+msgstr ""
+
+#: ../Debian/Dgit.pm:506
+msgid ""
+"not in a git working tree?\n"
+"(git rev-parse --show-toplevel produced no output)\n"
+msgstr ""
+
+#: ../Debian/Dgit.pm:509
+#, perl-format
+msgid "chdir toplevel %s: %s\n"
+msgstr ""
+
+#: ../Debian/Dgit.pm:617
 msgid "git index contains changes (does not match HEAD)"
 msgstr ""
 
-#: ../Debian/Dgit.pm:545
+#: ../Debian/Dgit.pm:618
 msgid "working tree is dirty (does not match HEAD)"
 msgstr ""
 
-#: ../Debian/Dgit.pm:616
+#: ../Debian/Dgit.pm:689
 msgid "detached HEAD"
 msgstr ""
 
-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:690
 msgid "HEAD symref is not to refs/"
 msgstr ""
 
-#: ../Debian/Dgit.pm:633
+#: ../Debian/Dgit.pm:706
 #, perl-format
 msgid "parsing of %s failed"
 msgstr ""
 
-#: ../Debian/Dgit.pm:642
+#: ../Debian/Dgit.pm:715
 #, perl-format
 msgid ""
 "control file %s is (already) PGP-signed.  Note that dgit push needs to "
 "modify the .dsc and then do the signature itself"
 msgstr ""
 
-#: ../Debian/Dgit.pm:656
+#: ../Debian/Dgit.pm:729
 #, perl-format
 msgid "open %s (%s): %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:677
+#: ../Debian/Dgit.pm:750
 #, perl-format
 msgid "missing field %s in %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:749
+#: ../Debian/Dgit.pm:822
 msgid "Dummy commit - do not use\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:838
+#: ../Debian/Dgit.pm:843
+#, perl-format
+msgid "exec %s: %s\n"
+msgstr ""
+
+#: ../Debian/Dgit.pm:911
 #, perl-format
 msgid "cannot stat %s/.git: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:861
+#: ../Debian/Dgit.pm:934
 #, perl-format
 msgid "failed to mkdir playground parent %s: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:869
+#: ../Debian/Dgit.pm:942
 #, perl-format
 msgid "failed to mkdir a playground %s: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:878
+#: ../Debian/Dgit.pm:951
 #, perl-format
 msgid "failed to mkdir the playground %s: %s"
 msgstr ""
diff --git a/po4a/dgit-sponsorship_7.pot b/po4a/dgit-sponsorship_7.pot
index fb45886..16d8859 100644
--- a/po4a/dgit-sponsorship_7.pot
+++ b/po4a/dgit-sponsorship_7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-04 01:04+0100\n"
+"POT-Creation-Date: 2018-10-13 20:41+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,11 +27,11 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
 #: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
+#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598
 #: ../git-debrebase.5.pod:678
 #, no-wrap
 msgid "SEE ALSO"
@@ -517,7 +517,7 @@ msgid ""
 "You will need to pass C<--overwrite> to dgit push for every successive "
 "upload.  This disables a safety catch which would normally spot situations "
 "where changes are accidentally lost.  When your sponsee is sending you "
-"source packages - perhaps multiple source pacakges with the same version "
+"source packages - perhaps multiple source packages with the same version "
 "number - these safety catches are inevitably ineffective."
 msgstr ""
 
diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot
index 8a7fd86..ff4a730 100644
--- a/po4a/dgit_1.pot
+++ b/po4a/dgit_1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-04 01:04+0100\n"
+"POT-Creation-Date: 2018-10-13 20:41+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -317,7 +317,7 @@ msgstr ""
 #. type: Plain text
 #: ../dgit.1:137
 msgid ""
-"dgit checkout will normally need to aceess the archive server, to "
+"dgit checkout will normally need to access the archive server, to "
 "canonicalise the provided suite name.  The exception is if you specify the "
 "canonical name, and the branch (or tracking branch) already exists."
 msgstr ""
@@ -345,8 +345,8 @@ msgstr ""
 #. type: Plain text
 #: ../dgit.1:152
 msgid ""
-"dgit's build operations access the the network, to get the -v option right.  "
-"See -v, below."
+"dgit's build operations access the network, to get the -v option right.  See "
+"-v, below."
 msgstr ""
 
 #. type: TP
@@ -417,7 +417,7 @@ msgid "B<dgit help>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:185 ../dgit.1:1123
+#: ../dgit.1:185 ../dgit.1:1168
 msgid "Print a usage summary."
 msgstr ""
 
@@ -843,7 +843,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../dgit.1:428
-msgid "There is only only sub-option:"
+msgid "There is only one sub-option:"
 msgstr ""
 
 #. type: Plain text
@@ -859,7 +859,7 @@ msgstr ""
 #: ../dgit.1:453
 msgid ""
 "If I<branch> is prefixed with B<+> then if it already exists, it will be "
-"simply ovewritten, no matter its existing contents.  If I<branch> is "
+"simply overwritten, no matter its existing contents.  If I<branch> is "
 "prefixed with B<..> then if it already exists and dgit actually imports the "
 "dsc (rather than simply reading the git commit out of the Dgit field), dgit "
 "will make a pseudomerge so that the result is necessarily fast forward from "
@@ -919,7 +919,7 @@ msgstr ""
 #: ../dgit.1:476
 msgid ""
 "Prints the -i and -I arguments which must be passed to dpkg-souce to cause "
-"it to exclude exactly the .git diredcory and nothing else.  The separate "
+"it to exclude exactly the .git directory and nothing else.  The separate "
 "arguments are unquoted, separated by spaces, and do not contain spaces."
 msgstr ""
 
@@ -1054,41 +1054,46 @@ msgid ""
 "dependencies."
 msgstr ""
 
-#. type: TP
-#: ../dgit.1:541
-#, no-wrap
-msgid "B<--clean=git-ff> | B<-wgf>"
-msgstr ""
-
 #. type: Plain text
-#: ../dgit.1:550
+#: ../dgit.1:555
 msgid ""
+"dgit will only actually clean the tree if it needs to (because it needs to "
+"build the source package or binaries from your working tree).  Otherwise any "
+"untracked files will be simply ignored.  p.TP B<--clean=git-ff> | B<-wgf> "
 "Use B<git clean -xdff> to clean the working tree.  Like git clean -xdf but "
 "it also removes any subdirectories containing different git trees (which "
 "only unusual packages are likely to create)."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:550
+#: ../dgit.1:555
 #, no-wrap
-msgid "B<--clean=check> | B<-wc>"
+msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:556
+#: ../dgit.1:561
 msgid ""
 "Merely check that the tree is clean (does not contain uncommitted files).  "
 "Avoids running rules clean, and can avoid needing the build-dependencies."
 msgstr ""
 
+#. type: Plain text
+#: ../dgit.1:572
+msgid ""
+"With B<,ignores> or B<-wci>, untracked files covered by .gitignore are "
+"tolerated, so only files which show up as B<?> in git status (ie, ones you "
+"maybe forgot to git add)  are treated as a problem."
+msgstr ""
+
 #. type: TP
-#: ../dgit.1:556
+#: ../dgit.1:572
 #, no-wrap
 msgid "B<--clean=none> | B<-wn>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:564
+#: ../dgit.1:580
 msgid ""
 "Do not clean the tree, nor check that it is clean.  Avoids running rules "
 "clean, and can avoid needing the build-dependencies.  If there are files "
@@ -1097,42 +1102,85 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:564
+#: ../dgit.1:580
 #, no-wrap
-msgid "B<--clean=dpkg-source> | B<-wd>"
+msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:570
+#: ../dgit.1:585
 msgid ""
 "Use dpkg-buildpackage to do the clean, so that the source package is cleaned "
-"by dpkg-source running the package's clean target.  This is the default.  "
-"Requires the package's build dependencies."
+"by dpkg-source running the package's clean target.  --clean=dpkg-source is "
+"the default."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:589
+msgid "Without the extra B<d>, requires the package's build dependencies."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:599
+msgid ""
+"With B<...>-d or B<-wdd>, the build-dependencies are not checked (due to "
+"passing B<-d> to dpkg-buildpackage), which violates policy, but may work in "
+"practice."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:606
+msgid ""
+"The rules clean target will only be run if it is needed: when dgit is going "
+"to build source or binary packages from your working tree, rather than from "
+"your git branch (for example because of --include-dirty or because the "
+"binary package build uses your working tree)."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:616
+msgid ""
+"In all cases, dgit will check that there are (after rules clean, if "
+"applicable) no untracked un-ignored files, in case these are files you "
+"forgot to git add.  (Except that this check is not done for a `3.0 (quilt)' "
+"package when dgit has to apply patches, dirtily, to the working tree.)  If "
+"your package does not have a good .gitignore you will probably need --"
+"clean=dpkg-source,no-check aka -wdn."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:570
+#: ../dgit.1:616
 #, no-wrap
-msgid "B<--clean=dpkg-source-d> | B<-wdd>"
+msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:580
+#: ../dgit.1:620
 msgid ""
-"Use B<dpkg-buildpackage -d> to do the clean, so that the source package is "
-"cleaned by dpkg-source running the package's clean target.  The build-"
-"dependencies are not checked (due to B<-d>), which violates policy, but may "
-"work in practice."
+"Like --clean=dpkg-source, but does not care about untracked un-ignored files."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:580
+#: ../dgit.1:620
+#, no-wrap
+msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:625
+msgid ""
+"Like --clean=dpkg-source, but fails even on ignored untracked files.  This "
+"could perhaps be used to detect bugs in your rules clean target."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:625
 #, no-wrap
 msgid "B<-N> | B<--new>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:586
+#: ../dgit.1:631
 msgid ""
 "The package is or may be new in this suite.  Without this, dgit will refuse "
 "to push.  It may (for Debian, will) be unable to access the git history for "
@@ -1140,13 +1188,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:586
+#: ../dgit.1:631
 #, no-wrap
 msgid "B<--include-dirty>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:594
+#: ../dgit.1:639
 msgid ""
 "Do not complain if the working tree does not match your git HEAD, and when "
 "building, include the changes from your working tree.  This can be useful "
@@ -1156,24 +1204,24 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:594
+#: ../dgit.1:639
 #, no-wrap
 msgid "B<--ignore-dirty>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:597
+#: ../dgit.1:642
 msgid "Deprecated alias for --include-dirty."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:597
+#: ../dgit.1:642
 #, no-wrap
 msgid "B<--overwrite>[=I<previous-version>]"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:608
+#: ../dgit.1:653
 msgid ""
 "Declare that your HEAD really does contain all the (wanted) changes from all "
 "versions listed in its changelog; or, all (wanted) changes from I<previous-"
@@ -1182,14 +1230,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:615
+#: ../dgit.1:660
 msgid ""
 "It is safer not to specify I<previous-version>, and usually it's not "
 "needed.  Just say B<--overwrite>, unless you know what you are doing."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:619
+#: ../dgit.1:664
 msgid ""
 "This option is useful if you are the maintainer, and you have incorporated "
 "NMU changes into your own git workflow in a way that doesn't make your "
@@ -1197,14 +1245,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:625
+#: ../dgit.1:670
 msgid ""
 "This option is also usually necessary the first time a package is pushed "
 "with dgit push to a particular suite.  See B<dgit-maint->I<*>B<(7)>."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:639
+#: ../dgit.1:684
 msgid ""
 "If I<previous-version> is not specified, dgit will check that the version in "
 "the archive is mentioned in your debian/changelog.  (This will avoid losing "
@@ -1215,7 +1263,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:645
+#: ../dgit.1:690
 msgid ""
 "dgit push --overwrite will, if necessary, make a pseudo-merge (that is, "
 "something that looks like the result of git merge -s ours) to stitch the "
@@ -1224,7 +1272,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:650
+#: ../dgit.1:695
 msgid ""
 "(In quilt mode B<gbp>, B<dpm> or B<unpatched>, implying a split between the "
 "dgit view and the maintainer view, the pseudo-merge will appear only in the "
@@ -1232,18 +1280,18 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:650
+#: ../dgit.1:695
 #, no-wrap
 msgid "B<--delayed>=I<days>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:653
+#: ../dgit.1:698
 msgid "Upload to a DELAYED queue."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:663
+#: ../dgit.1:708
 msgid ""
 "B<WARNING:> If the maintainer responds by cancelling your upload from the "
 "queue, and does not make an upload of their own, this will not rewind the "
@@ -1253,27 +1301,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:668
+#: ../dgit.1:713
 msgid ""
 "If this situation arises, someone should make a suitable dgit push to update "
 "the contents of dgit-repos to a version without the controversial changes."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:668
+#: ../dgit.1:713
 #, no-wrap
 msgid "B<--no-chase-dsc-distro>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:674
+#: ../dgit.1:719
 msgid ""
 "Tells dgit not to look online for additional git repositories containing "
 "information about a particular .dsc being imported.  Chasing is the default."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:684
+#: ../dgit.1:729
 msgid ""
 "For most operations (such as fetch and pull), disabling chasing means dgit "
 "will access only the git server for the distro you are directly working "
@@ -1282,7 +1330,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:692
+#: ../dgit.1:737
 msgid ""
 "Disabling chasing can be hazardous: if the .dsc names a git commit which has "
 "been rewritten by those in charge of the distro, this option may prevent "
@@ -1291,13 +1339,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:692
+#: ../dgit.1:737
 #, no-wrap
 msgid "B<--save-dgit-view=>I<branch>|I<ref>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:702
+#: ../dgit.1:747
 msgid ""
 "Specifies that when a split view quilt mode is in operation, and dgit "
 "calculates (or looks up in its cache)  a dgit view corresponding to your "
@@ -1306,7 +1354,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:709
+#: ../dgit.1:754
 msgid ""
 "This option is effective only with the following operations: quilt-fixup; "
 "push; all builds.  And it is only effective with --[quilt=]gbp, --"
@@ -1314,25 +1362,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:713
+#: ../dgit.1:758
 msgid ""
-"If ref does not start with refs/ it is taken to to be a branch - i.e. refs/"
+"If ref does not start with refs/ it is taken to be a branch - i.e. refs/"
 "heads/ is prepended."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:717
+#: ../dgit.1:762
 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:717
+#: ../dgit.1:762
 #, no-wrap
 msgid "B<--deliberately->I<something>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:731
+#: ../dgit.1:776
 msgid ""
 "Declare that you are deliberately doing I<something>.  This can be used to "
 "override safety catches, including safety catches which relate to distro-"
@@ -1344,13 +1392,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:731
+#: ../dgit.1:776
 #, no-wrap
 msgid "B<--deliberately-not-fast-forward>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:737
+#: ../dgit.1:782
 msgid ""
 "Declare that you are deliberately rewinding history.  When pushing to "
 "Debian, use this when you are making a renewed upload of an entirely new "
@@ -1359,7 +1407,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:748
+#: ../dgit.1:793
 msgid ""
 "In split view quilt modes, this also prevents the construction by dgit of a "
 "pseudomerge to make the dgit view fast forwarding.  Normally only one of --"
@@ -1369,13 +1417,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:748
+#: ../dgit.1:793
 #, no-wrap
 msgid "B<--deliberately-include-questionable-history>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:757
+#: ../dgit.1:802
 msgid ""
 "Declare that you are deliberately including, in the git history of your "
 "current push, history which contains a previously-submitted version of this "
@@ -1387,13 +1435,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:757
+#: ../dgit.1:802
 #, no-wrap
 msgid "B<--deliberately-fresh-repo>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:762
+#: ../dgit.1:807
 msgid ""
 "Declare that you are deliberately rewinding history and want to throw away "
 "the existing repo.  Not relevant when pushing to Debian, as the Debian "
@@ -1401,13 +1449,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:762
+#: ../dgit.1:807
 #, no-wrap
 msgid "B<--quilt=linear>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:769
+#: ../dgit.1:814
 msgid ""
 "When fixing up source format `3.0 (quilt)' metadata, insist on generating a "
 "linear patch stack: one new patch for each relevant commit.  If such a stack "
@@ -1415,20 +1463,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:774
+#: ../dgit.1:819
 msgid ""
 "HEAD should be a series of plain commits (not touching debian/patches/), and "
 "pseudomerges, with as ancestor a patches-applied branch."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:774
+#: ../dgit.1:819
 #, no-wrap
 msgid "B<--quilt=auto>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:783
+#: ../dgit.1:828
 msgid ""
 "When fixing up source format `3.0 (quilt)' metadata, prefer to generate a "
 "linear patch stack (as with --quilt=auto)  but if that doesn't seem "
@@ -1438,13 +1486,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:783
+#: ../dgit.1:828
 #, no-wrap
 msgid "B<--quilt=smash>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:788
+#: ../dgit.1:833
 msgid ""
 "When fixing up source format `3.0 (quilt)' metadata, generate a single "
 "additional patch for all the changes made in git.  This is not a good idea "
@@ -1452,7 +1500,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:794
+#: ../dgit.1:839
 msgid ""
 "(If HEAD has any in-tree patches already, they must apply cleanly.  This "
 "will be the case for any trees produced by dgit fetch or clone; if you do "
@@ -1461,13 +1509,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:794
+#: ../dgit.1:839
 #, no-wrap
 msgid "B<--quilt=nofix>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:802
+#: ../dgit.1:847
 msgid ""
 "Check whether source format `3.0 (quilt)' metadata would need fixing up, "
 "but, if it does, fail.  You must then fix the metadata yourself somehow "
@@ -1476,13 +1524,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:802
+#: ../dgit.1:847
 #, no-wrap
 msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:807
+#: ../dgit.1:852
 msgid ""
 "Do not check whether up source format `3.0 (quilt)' metadata needs fixing "
 "up.  If you use this option and the metadata did in fact need fixing up, "
@@ -1490,20 +1538,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:807
+#: ../dgit.1:852
 #, no-wrap
 msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:814
+#: ../dgit.1:859
 msgid ""
 "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a "
 "B<maintainer view>, and do not want your branch changed by dgit."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:822
+#: ../dgit.1:867
 msgid ""
 "B<--gbp> (short for B<--quilt=gbp>)  is for use with git-buildpackage.  Your "
 "HEAD is expected to be a patches-unapplied git branch, except that it might "
@@ -1512,7 +1560,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:830
+#: ../dgit.1:875
 msgid ""
 "B<--dpm> (short for B<--quilt=dpm>)  is for use with git-dpm.  Your HEAD is "
 "expected to be a patches-applied git branch, except that it might contain "
@@ -1520,7 +1568,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:835
+#: ../dgit.1:880
 msgid ""
 "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git "
 "branch (and that any changes to upstream .gitignore files are represented as "
@@ -1528,7 +1576,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:853
+#: ../dgit.1:898
 msgid ""
 "With --quilt=gbp|dpm|unapplied, dgit push (or precursors like quilt-fixup "
 "and build) will automatically generate a conversion of your git branch into "
@@ -1541,7 +1589,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:862
+#: ../dgit.1:907
 msgid ""
 "B<If you have a branch like this it is essential to specify the appropriate "
 "--quilt= option!> This is because it is not always possible to tell: a "
@@ -1553,13 +1601,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:862
+#: ../dgit.1:907
 #, no-wrap
 msgid "B<-d>I<distro> | B<--distro=>I<distro>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:871
+#: ../dgit.1:916
 msgid ""
 "Specifies that the suite to be operated on is part of distro I<distro>.  "
 "This overrides the default value found from the git config option B<dgit-"
@@ -1569,7 +1617,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:877
+#: ../dgit.1:922
 msgid ""
 "If your suite is part of a distro that dgit already knows about, you can use "
 "this option to make dgit work even if your dgit doesn't know about the "
@@ -1578,7 +1626,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:882
+#: ../dgit.1:927
 msgid ""
 "To define a new distro it is necessary to define methods and URLs for "
 "fetching (and, for dgit push, altering) a variety of information both in the "
@@ -1586,13 +1634,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:882
+#: ../dgit.1:927
 #, no-wrap
 msgid "B<-C>I<changesfile>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:887
+#: ../dgit.1:932
 msgid ""
 "Specifies the .changes file which is to be uploaded.  By default dgit push "
 "looks for single .changes file in the parent directory whose filename "
@@ -1600,7 +1648,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:896
+#: ../dgit.1:941
 msgid ""
 "If the specified I<changesfile> pathname contains slashes, the directory "
 "part is also used as the value for B<--build-products-dir>; otherwise, the "
@@ -1608,17 +1656,17 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:896
+#: ../dgit.1:941
 #, no-wrap
 msgid "B<--rm-old-changes>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:908
+#: ../dgit.1:953
 msgid ""
 "When doing a build, delete any changes files matching "
 "I<package>B<_>I<version>B<_*.changes> before starting.  This ensures that "
-"dgit push (and dgit sbuild) will be able to unambigously identify the "
+"dgit push (and dgit sbuild) will be able to unambiguously identify the "
 "relevant changes files from the most recent build, even if there have been "
 "previous builds with different tools or options.  The default is not to "
 "remove, but B<--no-rm-old-changes> can be used to override a previous --rm-"
@@ -1626,32 +1674,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:911
+#: ../dgit.1:956
 msgid ""
 "Note that B<dgit push-source> will always find the right .changes, "
 "regardless of this option."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:911
+#: ../dgit.1:956
 #, no-wrap
 msgid "B<--build-products-dir=>I<directory>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:915
+#: ../dgit.1:960
 msgid ""
-"Specifies where to find and create tarballs, binry packages, source "
+"Specifies where to find and create tarballs, binary packages, source "
 "packages, .changes files, and so on."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:918
+#: ../dgit.1:963
 msgid "By default, dgit uses the parent directory (B<..>)."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:927
+#: ../dgit.1:972
 msgid ""
 "Changing this setting may necessitate moving .orig tarballs to the new "
 "directory, so it is probably best to use the B<dgit.default.build-products-"
@@ -1660,37 +1708,37 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:927
+#: ../dgit.1:972
 #, no-wrap
 msgid "B<--no-rm-on-error>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:930
+#: ../dgit.1:975
 msgid "Do not delete the destination directory if clone fails."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:930
+#: ../dgit.1:975
 #, no-wrap
 msgid "B<--dep14tag>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:937
+#: ../dgit.1:982
 msgid ""
 "Generates a DEP-14 tag (eg B<debian/>I<version>)  as well as a dgit tag (eg "
 "B<archive/debian/>I<version>)  where possible.  This is the default."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:937
+#: ../dgit.1:982
 #, no-wrap
 msgid "B<--no-dep14tag>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:943
+#: ../dgit.1:988
 msgid ""
 "Do not generate a DEP-14 tag, except in split quilt view mode.  (On servers "
 "where only the old tag format is supported, the dgit tag will have the "
@@ -1698,52 +1746,52 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:943
+#: ../dgit.1:988
 #, no-wrap
 msgid "B<--dep14tag-always>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:948
+#: ../dgit.1:993
 msgid ""
 "Insist on generating a DEP-14 tag as well as a dgit tag.  If the server does "
 "not support that, dgit push will fail."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:948
+#: ../dgit.1:993
 #, no-wrap
 msgid "B<-D>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:952
+#: ../dgit.1:997
 msgid ""
 "Prints debugging information to stderr.  Repeating the option produces more "
 "output (currently, up to -DDDD is meaningfully different)."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:952
+#: ../dgit.1:997
 #, no-wrap
 msgid "B<-c>I<name>B<=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:956
+#: ../dgit.1:1001
 msgid ""
 "Specifies a git configuration option, to be used for this run.  dgit itself "
 "is also controlled by git configuration options."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:956
+#: ../dgit.1:1001
 #, no-wrap
 msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:965
+#: ../dgit.1:1010
 msgid ""
 "Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during "
 "builds.  Changes (from debian/changelog) since this version will be included "
@@ -1753,7 +1801,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:971
+#: ../dgit.1:1016
 msgid ""
 "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-"
 "genchanges (and as a result, only the last stanza from debian/changelog will "
@@ -1761,30 +1809,30 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:971
+#: ../dgit.1:1016
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:974
+#: ../dgit.1:1019
 msgid "Passed to dpkg-genchanges (eventually)."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:974
+#: ../dgit.1:1019
 #, no-wrap
 msgid "B<--ch:>I<option>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:978
+#: ../dgit.1:1023
 msgid ""
 "Specifies a single additional option to pass, eventually, to dpkg-genchanges."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:985
+#: ../dgit.1:1030
 msgid ""
 "Options which are safe to pass include B<-C> (and also B<-si -sa -sd> "
 "although these should never be necessary with Debian since dgit "
@@ -1792,18 +1840,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:987
+#: ../dgit.1:1032
 msgid "For other options the caveat below applies."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:987
+#: ../dgit.1:1032
 #, no-wrap
 msgid "B<--curl:>I<option> | B<--dput:>I<option> |..."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1009
+#: ../dgit.1:1054
 msgid ""
 "Specifies a single additional option to pass to B<curl>, B<dput>, "
 "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
@@ -1813,7 +1861,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1017
+#: ../dgit.1:1062
 msgid ""
 "Use of this ability should not normally be necessary.  It is provided for "
 "working around bugs, or other unusual situations.  If you use these options, "
@@ -1822,7 +1870,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1022
+#: ../dgit.1:1067
 msgid ""
 "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option "
 "applies only when the program is invoked directly by dgit.  Usually, for "
@@ -1830,7 +1878,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1026
+#: ../dgit.1:1071
 msgid ""
 "Specifying --git is not effective for some lower-level read-only git "
 "operations performed by dgit, and also not when git is invoked by another "
@@ -1838,25 +1886,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1028
+#: ../dgit.1:1073
 msgid "See notes below regarding ssh and dgit."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1036
+#: ../dgit.1:1081
 msgid ""
 "NB that --gpg:option is not supported (because debsign does not have that "
 "facility).  But see B<-k> and the B<keyid> distro config setting."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1036
+#: ../dgit.1:1081
 #, no-wrap
 msgid "B<--curl=>I<program> | B<--dput=>I<program> |..."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1059
+#: ../dgit.1:1104
 msgid ""
 "Specifies alternative programs to use instead of B<curl>, B<dput>, "
 "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
@@ -1866,14 +1914,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1067
+#: ../dgit.1:1112
 msgid ""
 "For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, "
 "this applies only when the program is invoked directly by dgit."
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1074
+#: ../dgit.1:1119
 msgid ""
 "For B<dgit>, specifies the command to run on the remote host when dgit rpush "
 "needs to invoke a remote copy of itself.  (dgit also reinvokes itself as the "
@@ -1882,7 +1930,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1085
+#: ../dgit.1:1130
 msgid ""
 "B<gbp-build>'s value is used instead of gbp build or git-buildpackage.  (The "
 "default is the latter unless the former exists on PATH.)  B<gbp-pq>'s value "
@@ -1892,7 +1940,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1093
+#: ../dgit.1:1138
 msgid ""
 "For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo "
 "-E cowbuilder> respectively.  Like with gbp-build and gbp pq, the specified "
@@ -1900,7 +1948,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1110
+#: ../dgit.1:1155
 msgid ""
 "For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> "
 "environment variables, if set (see below).  And, for ssh, when accessing the "
@@ -1912,13 +1960,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1110
+#: ../dgit.1:1155
 #, no-wrap
 msgid "B<--existing-package=>I<package>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1120
+#: ../dgit.1:1165
 msgid ""
 "dgit push needs to canonicalise the suite name.  Sometimes, dgit lacks a way "
 "to ask the archive to do this without knowing the name of an existing "
@@ -1929,19 +1977,19 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1120
+#: ../dgit.1:1165
 #, no-wrap
 msgid "B<-h>|B<--help>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1123
+#: ../dgit.1:1168
 #, no-wrap
 msgid "B<--initiator-tempdir=>I<directory>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1132
+#: ../dgit.1:1177
 msgid ""
 "dgit rpush uses a temporary directory on the invoking (signing) host.  This "
 "option causes dgit to use I<directory> instead.  Furthermore, the specified "
@@ -1951,13 +1999,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1132
+#: ../dgit.1:1177
 #, no-wrap
 msgid "B<--force->I<something>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1140
+#: ../dgit.1:1185
 msgid ""
 "Instructs dgit to try to proceed despite detecting what it thinks is going "
 "to be a fatal problem.  B<This is probably not going to work.> These options "
@@ -1966,13 +2014,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1140
+#: ../dgit.1:1185
 #, no-wrap
 msgid "B<--force-import-dsc-with-dgit-field>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1147
+#: ../dgit.1:1192
 msgid ""
 "Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it.  "
 "The result is a fresh import, discarding the git history that the person who "
@@ -1980,26 +2028,26 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1147
+#: ../dgit.1:1192
 #, no-wrap
 msgid "B<--force-uploading-binaries>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1152
+#: ../dgit.1:1197
 msgid ""
 "Carry on and upload binaries even though dgit thinks your distro does not "
 "permit that."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1152
+#: ../dgit.1:1197
 #, no-wrap
 msgid "B<--force-uploading-source-only>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1158
+#: ../dgit.1:1203
 msgid ""
 "Carry on and do a source-only upload, without any binaries, even though dgit "
 "thinks your distro does not permit that, or does not permit that in this "
@@ -2007,13 +2055,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1158
+#: ../dgit.1:1203
 #, no-wrap
 msgid "B<--force-unrepresentable>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1165
+#: ../dgit.1:1210
 msgid ""
 "Carry on even if dgit thinks that your git tree contains changes (relative "
 "to your .orig tarballs)  which dpkg-source is not able to represent.  Your "
@@ -2021,65 +2069,65 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1165
+#: ../dgit.1:1210
 #, no-wrap
 msgid "B<--force-changes-origs-exactly>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1170
+#: ../dgit.1:1215
 msgid ""
 "Use the set of .origs specified in your .changes, exactly, without regard to "
 "what is in the archive already.  The archive may well reject your upload."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1170
+#: ../dgit.1:1215
 #, no-wrap
 msgid "B<--force-unsupported-source-format>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1174
+#: ../dgit.1:1219
 msgid ""
 "Carry on despite dgit not understanding your source package format.  dgit "
 "will probably mishandle it."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1174
+#: ../dgit.1:1219
 #, no-wrap
 msgid "B<--force-dsc-changes-mismatch>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1178
+#: ../dgit.1:1223
 msgid ""
 "Do not check whether .dsc and .changes match.  The archive will probably "
 "reject your upload."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1178
+#: ../dgit.1:1223
 #, no-wrap
 msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1184
+#: ../dgit.1:1229
 msgid ""
 "Force on or off the use of the absurd git-apply emulation when running gbp "
 "pq import when importing a package from a .dsc.  See Debian bug #841867."
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1184 ../dgit-downstream-dsc.7.pod:150
+#: ../dgit.1:1229 ../dgit-downstream-dsc.7.pod:150
 #, no-wrap
 msgid "CONFIGURATION"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1190
+#: ../dgit.1:1235
 msgid ""
 "dgit can be configured via the git config system.  You may set keys with git-"
 "config (either in system-global or per-tree configuration), or provide B<-"
@@ -2087,31 +2135,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1192
+#: ../dgit.1:1237
 msgid "Settings likely to be useful for an end user include:"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1192
+#: ../dgit.1:1237
 #, no-wrap
 msgid "B<dgit.default.build-products-dir>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1198
+#: ../dgit.1:1243
 msgid ""
 "Specifies where to find the built files to be uploaded, when --build-"
 "products-dir is not specified.  The default is the parent directory (B<..>)."
 msgstr ""
 
 #. type: =item
-#: ../dgit.1:1198 ../dgit-downstream-dsc.7.pod:286
+#: ../dgit.1:1243 ../dgit-downstream-dsc.7.pod:286
 #, no-wrap
 msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1203
+#: ../dgit.1:1248
 msgid ""
 "Specifies the distro for a suite.  dgit keys off the suite name (which "
 "appears in changelogs etc.), and uses that to determine the distro which is "
@@ -2119,92 +2167,106 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1206
+#: ../dgit.1:1251
 msgid "I<suite> may be a glob pattern."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1206
+#: ../dgit.1:1251
 #, no-wrap
 msgid "B<dgit.default.distro>I< distro>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1209
+#: ../dgit.1:1254
 msgid "The default distro for an unknown suite."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1209
+#: ../dgit.1:1254
 #, no-wrap
 msgid "B<dgit.default.default-suite>I< suite>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1212
+#: ../dgit.1:1257
 msgid "The default suite (eg for clone)."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1212
+#: ../dgit.1:1257
 #, no-wrap
 msgid "B<dgit.default.>*"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1217
+#: ../dgit.1:1262
 msgid ""
 "for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is "
 "no distro-specific setting."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1217
+#: ../dgit.1:1262
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.clean-mode>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1221
+#: ../dgit.1:1266
 msgid ""
 "One of the values for the command line --clean= option; used if --clean is "
 "not specified."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1221
+#: ../dgit.1:1266
 #, no-wrap
-msgid "B<dgit-distro.>I<distro>B<.quilt-mode>"
+msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1225
+#: ../dgit.1:1272
+msgid ""
+"Like .clean-mode, but ignored if the value does not make sense to this "
+"version of dgit.  Setting both .clean-mode and .clean-mode-newer is useful "
+"to provide a single git config compatible with different dgit versions."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1272
+#, no-wrap
+msgid "B<dgit-distro.>I<distro>B<.quilt->"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1276
 msgid ""
 "One of the values for the command line --quilt= option; used if --quilt is "
 "not specified."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1225
+#: ../dgit.1:1276
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1229
+#: ../dgit.1:1280
 msgid ""
 "Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is "
 "specified.  The default is not to remove."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1229
+#: ../dgit.1:1280
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1236
+#: ../dgit.1:1287
 msgid ""
 "Whether you have push access to the distro.  For Debian, it is OK to use "
 "auto, which uses readonly mode if you are not pushing right now; but, "
@@ -2213,52 +2275,52 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1236
+#: ../dgit.1:1287
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.keyid>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1240
+#: ../dgit.1:1291
 msgid "See also B<-k>."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1240
+#: ../dgit.1:1291
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1242
+#: ../dgit.1:1293
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.username>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1245
+#: ../dgit.1:1296
 msgid "Not relevant for Debian."
 msgstr ""
 
 #. type: =item
-#: ../dgit.1:1245 ../dgit-downstream-dsc.7.pod:242
+#: ../dgit.1:1296 ../dgit-downstream-dsc.7.pod:242
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.upload-host>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1248
+#: ../dgit.1:1299
 msgid "Might be useful if you have an intermediate queue server."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1248
+#: ../dgit.1:1299
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1253
+#: ../dgit.1:1304
 msgid ""
 "Values to configure for user.name and user.email in new git trees.  If not "
 "specified, the DEBFULLNAME and DEBEMAIL environment variables are used, "
@@ -2266,26 +2328,26 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1253
+#: ../dgit.1:1304
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.setup-useremail>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1257
+#: ../dgit.1:1308
 msgid ""
 "Whether to set user.name and user.email in new git trees.  True by default.  "
 "Ignored for dgit setup-setup-useremail, which does it anyway."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1257
+#: ../dgit.1:1308
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1262
+#: ../dgit.1:1313
 msgid ""
 "Whether to setup a merge driver which uses dpkg-mergechangelogs for debian/"
 "changelog.  True by default.  Ignored for dgit setup-mergechangelogs, which "
@@ -2293,13 +2355,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1262
+#: ../dgit.1:1313
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1268
+#: ../dgit.1:1319
 msgid ""
 "Whether to configure .git/info/attributes to suppress checkin/checkout file "
 "content transformations in new git trees.  True by default.  Ignored for "
@@ -2307,24 +2369,24 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1268
+#: ../dgit.1:1319
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1274
+#: ../dgit.1:1325
 msgid "Program to use instead of I<cmd>.  Works like B<-->I<cmd>B<=>... ."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1274
+#: ../dgit.1:1325
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1285
+#: ../dgit.1:1336
 msgid ""
 "Extra options to pass to I<cmd>.  Works like B<-->I<cmd>B<:>... .  To pass "
 "several options, configure multiple values in git config (with git config --"
@@ -2334,13 +2396,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: ../dgit.1:1285
+#: ../dgit.1:1336
 #, no-wrap
 msgid "ACCESS CONFIGURATION"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1290
+#: ../dgit.1:1341
 msgid ""
 "There are many other settings which specify how a particular distro's "
 "services (archive and git) are provided.  These should not normally be "
@@ -2349,204 +2411,204 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1290
+#: ../dgit.1:1341
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.nominal-distro>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1293
+#: ../dgit.1:1344
 msgid "Shown in git tags, Dgit fields, and so on."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1293
+#: ../dgit.1:1344
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.alias-canon>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1296
+#: ../dgit.1:1347
 msgid "Used for all access configuration lookup."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1296
+#: ../dgit.1:1347
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B</push.>*"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1302
+#: ../dgit.1:1353
 msgid ""
 "If set, overrides corresponding non B</push> config when B<readonly=false>, "
 "or when pushing and B<readonly=auto>."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1302
+#: ../dgit.1:1353
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-url>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1304
+#: ../dgit.1:1355
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1306
+#: ../dgit.1:1357
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-proto>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1308
+#: ../dgit.1:1359
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-path>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1310
+#: ../dgit.1:1361
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1312
+#: ../dgit.1:1363
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1314
+#: ../dgit.1:1365
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1316
+#: ../dgit.1:1367
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1318
+#: ../dgit.1:1369
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path>  | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1320
+#: ../dgit.1:1371
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1322
+#: ../dgit.1:1373
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.madison-distro>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1324
+#: ../dgit.1:1375
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1326
+#: ../dgit.1:1377
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1328
+#: ../dgit.1:1379
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1330
+#: ../dgit.1:1381
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.ssh>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1332
+#: ../dgit.1:1383
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1334
+#: ../dgit.1:1385
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1336
+#: ../dgit.1:1387
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.backports-quirk>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1338
+#: ../dgit.1:1389
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1340
+#: ../dgit.1:1391
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1342
+#: ../dgit.1:1393
 #, no-wrap
 msgid "B<dgit.default.old-dsc-distro>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1344
+#: ../dgit.1:1395
 #, no-wrap
 msgid "B<dgit.dsc-url-proto-ok.>I<protocol>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1346
+#: ../dgit.1:1397
 #, no-wrap
 msgid "B<dgit.dsc-url-proto-ok.bad-syntax>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1348
+#: ../dgit.1:1399
 #, no-wrap
 msgid "B<dgit.default.dsc-url-proto-ok>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1350
+#: ../dgit.1:1401
 #, no-wrap
 msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]"
 msgstr ""
 
 #. type: SH
-#: ../dgit.1:1352
+#: ../dgit.1:1403
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1353
+#: ../dgit.1:1404
 #, no-wrap
 msgid "B<DGIT_SSH>, B<GIT_SSH>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1362
+#: ../dgit.1:1413
 msgid ""
 "specify an alternative default program (and perhaps arguments) to use "
 "instead of ssh.  DGIT_SSH is consulted first and may contain arguments; if "
@@ -2556,40 +2618,40 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1362
+#: ../dgit.1:1413
 #, no-wrap
 msgid "B<DEBEMAIL>, B<DEBFULLNAME>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1366
+#: ../dgit.1:1417
 msgid ""
 "Default git user.email and user.name for new trees.  See B<dgit setup-new-"
 "tree>."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1366
+#: ../dgit.1:1417
 #, no-wrap
 msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1371
+#: ../dgit.1:1422
 msgid ""
 "and other subprograms and modules used by dgit are affected by various "
-"environment variables.  Consult the documentaton for those programs for "
+"environment variables.  Consult the documentation for those programs for "
 "details."
 msgstr ""
 
 #. type: SH
-#: ../dgit.1:1371
+#: ../dgit.1:1422
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1378
+#: ../dgit.1:1429
 msgid ""
 "There should be a `dgit rebase-prep' command or some such to turn a fast-"
 "forwarding branch containing pseudo-merges back into a rebasing patch "
@@ -2597,7 +2659,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1384
+#: ../dgit.1:1435
 msgid ""
 "If the dgit push fails halfway through, it is not necessarily restartable "
 "and idempotent.  It would be good to check that the proposed signing key is "
@@ -2605,7 +2667,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1389
+#: ../dgit.1:1440
 msgid ""
 "dgit's build functions, and dgit push, may make changes to your current "
 "HEAD.  Sadly this is necessary for packages in the `3.0 (quilt)' source "
@@ -2614,7 +2676,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1394
+#: ../dgit.1:1445
 msgid ""
 "--dry-run does not always work properly, as not doing some of the git "
 "fetches may result in subsequent actions being different.  Doing a non-dry-"
@@ -2622,24 +2684,24 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
 #: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
+#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598
 #: ../git-debrebase.5.pod:678
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1403
+#: ../dgit.1:1454
 msgid ""
 "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-"
 "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1),"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1404
+#: ../dgit.1:1455
 msgid "https://browse.dgit.debian.org/"
 msgstr ""
diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot
index cd5145e..78ed743 100644
--- a/po4a/dgit_7.pot
+++ b/po4a/dgit_7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-04 01:04+0100\n"
+"POT-Creation-Date: 2018-10-13 20:41+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,11 +39,11 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
 #: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
+#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598
 #: ../git-debrebase.5.pod:678
 #, no-wrap
 msgid "SEE ALSO"
@@ -494,7 +494,7 @@ msgstr ""
 #. type: Plain text
 #: ../dgit.7:303
 msgid ""
-"Simply commiting to source files (whether in debian/ or not, but not to "
+"Simply committing to source files (whether in debian/ or not, but not to "
 "patches)  will result in a branch that dgit quilt-fixup can linearise.  "
 "Other kinds of changes, including editing patches or merging, cannot be "
 "handled this way."
@@ -733,7 +733,7 @@ msgstr ""
 msgid ""
 "Delete the files from your git branches, and your Debian source packages, "
 "and carry the deletion as a delta from upstream.  (With `3.0 (quilt)' this "
-"means represeting the deletions as patches.  You may need to pass --include-"
+"means representing the deletions as patches.  You may need to pass --include-"
 "removal to dpkg-source --commit, or pass corresponding options to other "
 "tools.)  This can make the Debian source package less useful for people "
 "without Debian build infrastructure."
diff --git a/po4a/list-documents b/po4a/list-documents
index ca17ec5..4d625e0 100755
--- a/po4a/list-documents
+++ b/po4a/list-documents
@@ -13,7 +13,7 @@ cat <<END
 # ^ add your language here (separate with spaces)
 
 # Do not edit the rest of this file.  It is automatically maintained.
-[options] opt:"-MUTF-8" opt:"-k50"
+[options] opt:"-MUTF-8" opt:"-k10"
 [po4a_paths] \$master.pot \$lang:\$master.\$lang.po
 END
 
diff --git a/po4a/po4a.cfg b/po4a/po4a.cfg
index a395c08..a7c3e12 100644
--- a/po4a/po4a.cfg
+++ b/po4a/po4a.cfg
@@ -2,7 +2,7 @@
 # ^ add your language here (separate with spaces)
 
 # Do not edit the rest of this file.  It is automatically maintained.
-[options] opt:"-MUTF-8" opt:"-k50"
+[options] opt:"-MUTF-8" opt:"-k10"
 [po4a_paths] $master.pot $lang:$master.$lang.po
 [type: man] ../dgit.1 $lang:translated/man/$lang/man1/dgit.1 master:file=dgit_1
 [type: man] ../dgit.7 $lang:translated/man/$lang/man7/dgit.7 master:file=dgit_7
diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index dbceb42..bc8b2aa 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -34,7 +34,9 @@ bm-prep () {
 			dpkgbuildpackage_deps_for_clean=false
 	fi
 
-	cleanmodes_default="git none dpkg-source dpkg-source-d"
+	cleanmodes_default="git none"
+	cleanmodes_default+=" dpkg-source$cleanmodes_dpkgsource_extra"
+	cleanmodes_default+=" dpkg-source-d$cleanmodes_dpkgsource_extra"
 	cleanmodes_all="$cleanmodes_default git-ff check"
 	cleanmodes="$cleanmodes_default"
 }
@@ -47,7 +49,7 @@ bm-gbp-example-acts () {
 
 	bm-prep-ownpackage-branches for-build-modes
 
-	cleanmodes='git dpkg-source'
+	cleanmodes='git dpkg-source,no-check'
 
 	for act in "$@"; do
 		bm-guess-e-source-e-targets "$act"
@@ -127,17 +129,17 @@ bm-compute-expected () {
 	*[^\ ]*)
 		;;
 	*)
-		# dgit won't bother cleaning the tree
-		# if no build is going to be run
-		eff_cleanmode=none
+		# if no build is going to be run, dgit will only check
+		# cleanliness rather than actually cleaning
+		eff_cleanmode=C$cleanmode
 		;;
 	esac
 
 	case "$act" in
 	sbuild*)
-		# dgit sbuild won't bother cleaning the tree
+		# dgit sbuild will only check cleanliness
 		# because it doesn't need to to make a .dsc for sbuild
-		eff_cleanmode=none
+		eff_cleanmode=C$cleanmode
 		;;
 	esac
 
@@ -148,15 +150,29 @@ bm-compute-expected () {
 	case $eff_cleanmode in
 	git)		echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
 	git-ff)		echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
-	check)		echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;;
-	dpkg-source-d)	echo >&4 "EXAMPLE RULES TARGET clean" ;;
-	dpkg-source)	bm-build-deps-ok || tolerate_fail=tolerate
+	check|Ccheck)	echo >&4 'BUILD-MODES PROGRAM git clean -dn -x' ;;
+	dpkg-source-d|dpkg-source-d,no-check)
 			echo >&4 "EXAMPLE RULES TARGET clean"
 			;;
-	none)		;;
+	dpkg-source|dpkg-source,no-check)
+			bm-build-deps-ok || tolerate_fail=tolerate
+			echo >&4 "EXAMPLE RULES TARGET clean"
+			;;
+	none|Cnone)	;;
+	Cdpkg-source*)	;; # handled below
+	Cgit|Cgit-ff)	;;
 	*)		fail "t-compute-expected-run $cleanmode ??" ;;
 	esac
 
+	case $eff_cleanmode in
+	dpkg-source|Cdpkg-source|dpkg-source-d|Cdpkg-source-d)
+			echo >&4 'BUILD-MODES PROGRAM git clean -dn'
+			;;
+	dpkg-source*,no-check|Cdpkg-source*,no-check)
+			;;
+	Cdpkg-source*)	fail "t-compute-expected-run wd $cleanmode ??" ;;
+	esac
+
 	if [ "x$e_targets" != x ]; then
 		# e_targets can be " " to mean `/may/ fail due to b-d'
 		bm-build-deps-ok || tolerate_fail=tolerate
diff --git a/tests/tests/build-modes-gbp b/tests/tests/build-modes-gbp
index d99b791..93d0811 100755
--- a/tests/tests/build-modes-gbp
+++ b/tests/tests/build-modes-gbp
@@ -21,6 +21,7 @@ quirk-clean-fixup () {
 }
 bm_quirk_before_diff=quirk-clean-fixup
 
+cleanmodes_dpkgsource_extra=,no-check
 bm-prep
 
 for act in					\
diff --git a/tests/tests/oldnewtagalt b/tests/tests/oldnewtagalt
index 098fe19..6730918 100755
--- a/tests/tests/oldnewtagalt
+++ b/tests/tests/oldnewtagalt
@@ -9,7 +9,7 @@ cd $p
 
 test-push () {
 	t-commit "$1"
-	t-dgit build-source
+	t-dgit -wgf build-source
 	t-dgit push
 }
 
diff --git a/tests/tests/push-source b/tests/tests/push-source
index f0eafb8..79c4636 100755
--- a/tests/tests/push-source
+++ b/tests/tests/push-source
@@ -12,7 +12,7 @@ cd $p
 t-refs-same-start
 t-ref-head
 
-t-dgit --dpkg-buildpackage:-d push-source --new
+t-dgit push-source --new
 
 t-pushed-good master
 t-push-was-source-only
diff --git a/tests/tests/push-source-with-changes b/tests/tests/push-source-with-changes
index 580ea3a..aed1b63 100755
--- a/tests/tests/push-source-with-changes
+++ b/tests/tests/push-source-with-changes
@@ -13,14 +13,24 @@ t-ref-head
 
 # (1) try pushing a changes file containing binaries
 
-t-dgit --dpkg-buildpackage:-d build -F
+t-dgit build -F
 
 t-expect-push-fail 'user-specified changes file is not source-only' \
 t-dgit -C ../${p}_1.0_multi.changes push-source --new
 
 # (2) try pushing a source-only changes file
 
-t-dgit --dpkg-buildpackage:-d build-source
+t-expect-fail F:'tree contains uncommitted files' \
+t-dgit build-source
+
+cp debian/rules{,~}
+git clean -df
+ls debian/rules~
+
+t-expect-fail F:'tree contains uncommitted files' \
+t-dgit -wdda build-source
+
+t-dgit build-source
 t-dgit -C ../${p}_1.0_source.changes push-source --new
 
 t-pushed-good master