From 5656f77c337111ea62c66f56c577da22513b9d3b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 28 Apr 2017 17:42:20 +0100 Subject: [PATCH] spelling --- README.git-debrebase | 2 +- git-debrebase | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.git-debrebase b/README.git-debrebase index ee223c6b..eed1754d 100644 --- a/README.git-debrebase +++ b/README.git-debrebase @@ -48,7 +48,7 @@ Looking from the tip of the interchange view, it is I think always possible to classify these commits appropriately: pseudomerges are fairly obvious (if all three trees are identical, we descend to the parent with the most recent commit date), and the `p' special merge is -the only non-psuedo merge and has a special form. +the only non-pseudo merge and has a special form. So it would be possible to write a `git-debrebase' tool which would take (for example) B4, above, and be able to perform functions like: diff --git a/git-debrebase b/git-debrebase index 3857f4db..3469f33d 100755 --- a/git-debrebase +++ b/git-debrebase @@ -308,7 +308,7 @@ sub walk ($$$;$$$) { # => ($tip, $breakwater_tip) my (@deb_cl, @ups_cl, @processed); my %found; - my @psuedomerges; + my @pseudomerges; $report //= sub { }; $report_anomaly //= sub { -- 2.30.2