Merge branch 'maint' to sync with GIT 1.6.0.6

diff --git a/builtin-add.c b/builtin-add.c
index ea4e77169a782ef38ed1c0524952a7220cbf739d..719de8b0f2d2d831f326d948aa18700e5c474950 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -23,7 +23,7 @@ static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
        int num_unmatched = 0, i;
 
        /*
-        * Since we are walking the index as if we are warlking the directory,
+        * Since we are walking the index as if we were walking the directory,
         * we have to mark the matched pathspec as seen; otherwise we will
         * mistakenly think that the user gave a pathspec that did not match
         * anything.