Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Typofixes outside documentation area

    begining -> beginning
    canonicalizations -> canonicalization
    comand -> command
    dewrapping -> unwrapping
    dirtyness -> dirtiness
    DISCLAMER -> DISCLAIMER
    explicitely -> explicitly
    feeded -> fed
    impiled -> implied
    madatory -> mandatory
    mimick -> mimic
    preceeding -> preceding
    reqeuest -> request
    substition -> substitution

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit 9517e6b84357252e1882091343661c34d978771e 1 parent 4b7acc1
Junio C Hamano gitster authored
2  builtin-apply.c
@@ -2006,7 +2006,7 @@ static int find_pos(struct image *img,
2006 2006 return -1;
2007 2007
2008 2008 /*
2009   - * If match_begining or match_end is specified, there is no
  2009 + * If match_beginning or match_end is specified, there is no
2010 2010 * point starting from a wrong line that will never match and
2011 2011 * wander around and wait for a match at the specified end.
2012 2012 */
5 builtin-cat-file.c
@@ -219,9 +219,10 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
219 219 "exit with zero when there's no error", 'e'),
220 220 OPT_SET_INT('p', NULL, &opt, "pretty-print object's content", 'p'),
221 221 OPT_SET_INT(0, "batch", &batch,
222   - "show info and content of objects feeded on stdin", BATCH),
  222 + "show info and content of objects fed from the standard input",
  223 + BATCH),
223 224 OPT_SET_INT(0, "batch-check", &batch,
224   - "show info about objects feeded on stdin",
  225 + "show info about objects fed from the standard input",
225 226 BATCH_CHECK),
226 227 OPT_END()
227 228 };
2  builtin-log.c
@@ -1089,7 +1089,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
1089 1089
1090 1090 /*
1091 1091 * We cannot move this anywhere earlier because we do want to
1092   - * know if --root was given explicitly from the comand line.
  1092 + * know if --root was given explicitly from the command line.
1093 1093 */
1094 1094 rev.show_root_diff = 1;
1095 1095
2  builtin-prune.c
@@ -106,7 +106,7 @@ static void prune_object_dir(const char *path)
106 106 /*
107 107 * Write errors (particularly out of space) can result in
108 108 * failed temporary packs (and more rarely indexes and other
109   - * files begining with "tmp_") accumulating in the object
  109 + * files beginning with "tmp_") accumulating in the object
110 110 * and the pack directories.
111 111 */
112 112 static void remove_temporary_files(const char *path)
2  builtin-show-branch.c
@@ -567,7 +567,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
567 567 return config_error_nonbool(var);
568 568 /*
569 569 * default_arg is now passed to parse_options(), so we need to
570   - * mimick the real argv a bit better.
  570 + * mimic the real argv a bit better.
571 571 */
572 572 if (!default_num) {
573 573 default_alloc = 20;
2  compat/win32/pthread.c
... ... @@ -1,7 +1,7 @@
1 1 /*
2 2 * Copyright (C) 2009 Andrzej K. Haczewski <ahaczewski@gmail.com>
3 3 *
4   - * DISCLAMER: The implementation is Git-specific, it is subset of original
  4 + * DISCLAIMER: The implementation is Git-specific, it is subset of original
5 5 * Pthreads API, without lots of other features that Git doesn't use.
6 6 * Git also makes sure that the passed arguments are valid, so there's
7 7 * no need for double-checking.
2  connect.c
@@ -504,7 +504,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
504 504
505 505 /*
506 506 * Don't do destructive transforms with git:// as that
507   - * protocol code does '[]' dewrapping of its own.
  507 + * protocol code does '[]' unwrapping of its own.
508 508 */
509 509 if (host[0] == '[') {
510 510 end = strchr(host + 1, ']');
2  contrib/fast-import/import-directories.perl
@@ -344,7 +344,7 @@ =head2 Escaping special characters
344 344
345 345 Key and value strings may be enclosed in quotes, in which case
346 346 whitespace inside the quotes is preserved. Additionally, an equal
347   -sign may be included in the key by preceeding it with a backslash.
  347 +sign may be included in the key by preceding it with a backslash.
348 348 For example:
349 349
350 350 "key1 "=value1
2  daemon.c
@@ -407,7 +407,7 @@ static void parse_host_and_port(char *hostport, char **host,
407 407
408 408 end = strchr(hostport, ']');
409 409 if (!end)
410   - die("Invalid reqeuest ('[' without ']')");
  410 + die("Invalid request ('[' without ']')");
411 411 *end = '\0';
412 412 *host = hostport + 1;
413 413 if (!end[1])
2  diff.c
@@ -3642,7 +3642,7 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3642 3642 struct diff_filepair *p = q->queue[i];
3643 3643
3644 3644 /*
3645   - * 1. Entries that come from stat info dirtyness
  3645 + * 1. Entries that come from stat info dirtiness
3646 3646 * always have both sides (iow, not create/delete),
3647 3647 * one side of the object name is unknown, with
3648 3648 * the same mode and size. Keep the ones that
2  levenshtein.h
@@ -2,7 +2,7 @@
2 2 #define LEVENSHTEIN_H
3 3
4 4 int levenshtein(const char *string1, const char *string2,
5   - int swap_penalty, int substition_penalty,
  5 + int swap_penalty, int substitution_penalty,
6 6 int insertion_penalty, int deletion_penalty);
7 7
8 8 #endif
2  path.c
@@ -610,7 +610,7 @@ int daemon_avoid_alias(const char *p)
610 610 /*
611 611 * This resurrects the belts and suspenders paranoia check by HPA
612 612 * done in <435560F7.4080006@zytor.com> thread, now enter_repo()
613   - * does not do getcwd() based path canonicalizations.
  613 + * does not do getcwd() based path canonicalization.
614 614 *
615 615 * sl becomes true immediately after seeing '/' and continues to
616 616 * be true as long as dots continue after that without intervening
4 perl/Git.pm
@@ -204,14 +204,14 @@ sub repository {
204 204 $dir = $opts{Directory};
205 205
206 206 unless (-d "$dir/refs" and -d "$dir/objects" and -e "$dir/HEAD") {
207   - # Mimick git-rev-parse --git-dir error message:
  207 + # Mimic git-rev-parse --git-dir error message:
208 208 throw Error::Simple("fatal: Not a git repository: $dir");
209 209 }
210 210 my $search = Git->repository(Repository => $dir);
211 211 try {
212 212 $search->command('symbolic-ref', 'HEAD');
213 213 } catch Git::Error::Command with {
214   - # Mimick git-rev-parse --git-dir error message:
  214 + # Mimic git-rev-parse --git-dir error message:
215 215 throw Error::Simple("fatal: Not a git repository: $dir");
216 216 }
217 217
2  refs.c
@@ -706,7 +706,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
706 706
707 707 has_glob_specials = strpbrk(pattern, "?*[");
708 708 if (!has_glob_specials) {
709   - /* Append impiled '/' '*' if not present. */
  709 + /* Append implied '/' '*' if not present. */
710 710 if (real_pattern.buf[real_pattern.len - 1] != '/')
711 711 strbuf_addch(&real_pattern, '/');
712 712 /* No need to check for '*', there is none. */
2  setup.c
@@ -206,7 +206,7 @@ int is_inside_work_tree(void)
206 206 }
207 207
208 208 /*
209   - * set_work_tree() is only ever called if you set GIT_DIR explicitely.
  209 + * set_work_tree() is only ever called if you set GIT_DIR explicitly.
210 210 * The old behaviour (which we retain here) is to set the work tree root
211 211 * to the cwd, unless overridden by the config, the command line, or
212 212 * GIT_WORK_TREE.
2  test-chmtime.c
... ... @@ -1,7 +1,7 @@
1 1 /*
2 2 * This program can either change modification time of the given
3 3 * file(s) or just print it. The program does not change atime nor
4   - * ctime (their values are explicitely preserved).
  4 + * ctime (their values are explicitly preserved).
5 5 *
6 6 * The mtime can be changed to an absolute value:
7 7 *
2  transport-helper.c
@@ -171,7 +171,7 @@ static struct child_process *get_helper(struct transport *transport)
171 171 } else if (!strcmp(capname, "connect")) {
172 172 data->connect = 1;
173 173 } else if (mandatory) {
174   - die("Unknown madatory capability %s. This remote "
  174 + die("Unknown mandatory capability %s. This remote "
175 175 "helper probably needs newer version of Git.\n",
176 176 capname);
177 177 }

0 comments on commit 9517e6b

Please sign in to comment.
Something went wrong with that request. Please try again.