path: root/git-archimport.perl
diff options
authorPavel Roskin <>2006-07-10 05:50:18 (GMT)
committerJunio C Hamano <>2006-07-10 07:36:44 (GMT)
commit82e5a82fd73edb80a841f5fab1660e14b9b8f3ad (patch)
tree9661cdf47ee3bf69192ff336e0514fc6dd607728 /git-archimport.perl
parent930cf7dd7cc6b87d173f182230763e1f1913d319 (diff)
Fix more typos, primarily in the code
The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'git-archimport.perl')
1 files changed, 4 insertions, 4 deletions
diff --git a/git-archimport.perl b/git-archimport.perl
index 740bc1f..ada60ec 100755
--- a/git-archimport.perl
+++ b/git-archimport.perl
@@ -14,7 +14,7 @@
Imports a project from one or more Arch repositories. It will follow branches
and repositories within the namespaces defined by the <archive/branch>
-parameters suppplied. If it cannot find the remote branch a merge comes from
+parameters supplied. If it cannot find the remote branch a merge comes from
it will just import it as a regular commit. If it can find it, it will mark it
as a merge whenever possible.
@@ -88,7 +88,7 @@ usage if $opt_h;
# $arch_branches:
# values associated with keys:
# =1 - Arch version / git 'branch' detected via abrowse on a limit
-# >1 - Arch version / git 'branch' of an auxilliary branch we've merged
+# >1 - Arch version / git 'branch' of an auxiliary branch we've merged
my %arch_branches = map { $_ => 1 } @ARGV;
$ENV{'TMPDIR'} = $opt_t if $opt_t; # $ENV{TMPDIR} will affect tempdir() calls:
@@ -667,7 +667,7 @@ sub apply_cset {
if (`find $tmp/changeset/patches -type f -name '*.patch'`) {
# this can be sped up considerably by doing
# (find | xargs cat) | patch
- # but that cna get mucked up by patches
+ # but that can get mucked up by patches
# with missing trailing newlines or the standard
# 'missing newline' flag in the patch - possibly
# produced with an old/buggy diff.
@@ -1026,7 +1026,7 @@ sub commitid2pset {
-# an alterative to `command` that allows input to be passed as an array
+# an alternative to `command` that allows input to be passed as an array
# to work around shell problems with weird characters in arguments
sub safe_pipe_capture {
my @output;