X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=079e5dec7c212c0c4ea1be9ecb76f4891af75cfb;hp=066f2a6c63fd0ef7ffb29ee968c083bdca8b86dd;hb=9184953b37fef6964d1545fda3832e8eaaba986d;hpb=e7c34101d87a60d326b657432f19e2b15edb8471

diff --git a/dgit b/dgit
index 066f2a6c..079e5dec 100755
--- a/dgit
+++ b/dgit
@@ -2635,6 +2635,8 @@ sub clean_tree () {
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-T 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 'none') {
     } else {
 	die "$cleanmode ?";
@@ -2871,7 +2873,7 @@ sub parseopts () {
 	    } elsif (m/^--build-products-dir=(.*)/s) {
 		push @ropts, $_;
 		$buildproductsdir = $1;
-	    } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
+	    } elsif (m/^--clean=(dpkg-source|git|git-ff|none)$/s) {
 		push @ropts, $_;
 		$cleanmode = $1;
 	    } elsif (m/^--clean=(.*)$/s) {
@@ -2943,6 +2945,9 @@ sub parseopts () {
 		} elsif (s/^-wg$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'git';
+		} elsif (s/^-wgf$//s) {
+		    push @ropts, $&;
+		    $cleanmode = 'git-ff';
 		} elsif (s/^-wd$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'dpkg-source';