Fix spelling of "pseudo"

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 81872b3b0a89d5da5e7530eda5e7624238699be2..a8f5deb5230eb947eea3dcd55f033e315dd4003c 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -5,7 +5,7 @@
 
     We want a --overwrite=VERSION option which 1. adjusts
     the version used above, and 2. does the same thing in any
-    quilt mode.  If no split brain it should make the psuedomerge
+    quilt mode.  If no split brain it should make the pseudomerge
     on the user's HEAD.
 
 

diff --git a/dgit b/dgit
index b1cb9b25dabb8516baa5356817864a62608bbdba..ff5f5547ce11fe11b04f863e885912e1ee638877 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -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}

diff --git a/dgit.7 b/dgit.7
index d57cff72f59a3d9ab109b661670ebb8270bfbfc3..cbf91b90e8d15d70f57b0108e2c27dba08ba6095 100644 (file)
--- a/dgit.7
+++ b/dgit.7
@@ -49,7 +49,7 @@ branch) whose tree is identical to the unpacked source upload.
 Uploads not made by dgit are represented in git by commits which are
 synthesised by dgit.  The tree of each such commit corresponds to the
 unpacked source; there is an origin commit with the contents, and a
-psuedo-merge from last known upload - that is, from the contents of
+pseudo-merge from last known upload - that is, from the contents of
 the dgit/suite branch.
 
 dgit expects repos that it works with to have a

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index 2dc9b420e3bd3ab47ddb2bc46744661e268fa027..e0911653cc9e172e3e71884382e7a0e1fca0638d 100755 (executable)
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -42,7 +42,7 @@ echo wombat >>debian/pointless-for-dgit-test
 git add debian/pointless-for-dgit-test
 git commit -m 'Pointless 2'
 
-t-commit 'Check psuedomerge' 1.0-3
+t-commit 'Check pseudomerge' 1.0-3
 
 t-dgit --quilt=gbp --clean=git build-source