diff options
| -rw-r--r-- | Documentation/i18n.txt | 2 | ||||
| -rw-r--r-- | builtin-blame.c | 2 | ||||
| -rw-r--r-- | ident.c | 2 | ||||
| -rw-r--r-- | merge-recursive.c | 2 | ||||
| -rw-r--r-- | setup.c | 2 | ||||
| -rw-r--r-- | sha1_file.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/i18n.txt b/Documentation/i18n.txt index b95f99be6..1e188e6e7 100644 --- a/Documentation/i18n.txt +++ b/Documentation/i18n.txt @@ -22,7 +22,7 @@ does not forbid it. However, there are a few things to keep in mind. . `git-commit-tree` (hence, `git-commit` which uses it) issues - an warning if the commit log message given to it does not look + a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in `.git/config` file, like this: diff --git a/builtin-blame.c b/builtin-blame.c index d98caaf21..9b4c02e87 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -606,7 +606,7 @@ static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e) /* * src typically is on-stack; we want to copy the information in it to - * an malloced blame_entry that is already on the linked list of the + * a malloced blame_entry that is already on the linked list of the * scoreboard. The origin of dst loses a refcnt while the origin of src * gains one. */ @@ -152,7 +152,7 @@ static int copy(char *buf, size_t size, int offset, const char *src) /* * Copy the rest to the buffer, but avoid the special * characters '\n' '<' and '>' that act as delimiters on - * a identification line + * an identification line */ for (i = 0; i < len; i++) { c = *src++; diff --git a/merge-recursive.c b/merge-recursive.c index 33ccc40ec..b34177d20 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -289,7 +289,7 @@ static int get_files_dirs(struct tree *tree) } /* - * Returns a index_entry instance which doesn't have to correspond to + * Returns an index_entry instance which doesn't have to correspond to * a real cache entry in Git's index. */ static struct stage_data *insert_stage_data(const char *path, @@ -140,7 +140,7 @@ const char **get_pathspec(const char *prefix, const char **pathspec) * Test if it looks like we're at a git directory. * We want to see: * - * - either a objects/ directory _or_ the proper + * - either an objects/ directory _or_ the proper * GIT_OBJECT_DIRECTORY environment variable * - a refs/ directory * - either a HEAD symlink or a HEAD file that is formatted as diff --git a/sha1_file.c b/sha1_file.c index b0c24356a..6583797ce 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -148,7 +148,7 @@ static void fill_sha1_path(char *pathbuf, const unsigned char *sha1) /* * NOTE! This returns a statically allocated buffer, so you have to be - * careful about using it. Do a "xstrdup()" if you need to save the + * careful about using it. Do an "xstrdup()" if you need to save the * filename. * * Also note that this returns the location for creating. Reading |