dgit: Allow --quilt=dpm

[dgit.git] / dgit

diff --git a/dgit b/dgit
index b1cb9b25dabb8516baa5356817864a62608bbdba..13c8addd895df282131000851f4355c6ba22344a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -65,7 +65,7 @@ our $changes_since_version;
 our $rmchanges;
 our $overwrite_version;
 our $quilt_mode;
-our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|unapplied';
+our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
 our $we_are_responder;
 our $initiator_tempdir;
 our $patches_applied_dirtily = 00;
@@ -1896,7 +1896,7 @@ sub fetch_from_archive () {
     # Finally: we do not necessarily reify the public view (as
     # described above).  This is so that we do not end up stacking two
     # pseudo-merges.  So what we actually do is figure out the inputs
-    # to any public view psuedo-merge and put them in @mergeinputs.
+    # to any public view pseudo-merge and put them in @mergeinputs.
 
     my @mergeinputs;
     # $mergeinputs[]{Commit}