aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-archimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-29 01:20:06 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-29 01:32:56 -0800
commit89438677abaae1a8ffc3c0905f3355a590da7bf4 (patch)
treef1d43ab8459bcc2010220c32c03001e7588b26f6 /Documentation/git-archimport.txt
parentf1ec72ba1e52783179a7da7defaab0458c895617 (diff)
downloadgit-89438677abaae1a8ffc3c0905f3355a590da7bf4.tar.gz
git-89438677abaae1a8ffc3c0905f3355a590da7bf4.tar.xz
Documentation: spell.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-archimport.txt')
-rw-r--r--Documentation/git-archimport.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index a2bd788f3..fe57fe1e9 100644
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -16,7 +16,7 @@ DESCRIPTION
-----------
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 (see discussion below).