Fix grammar nits in documentation and in code comments.
Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jim Meyering committed
Jan 3, 2008 at 15:18 UTC
790296fd8863d649054096191d33bacbbf5c2115
6 files changed
+6
-6
Documentation/i18n.txt
+1
-1
@@ -22,7 +22,7 @@ does not forbid it. However, there are a few things to keep in
22
mind.
23
24
. `git-commit-tree` (hence, `git-commit` which uses it) issues
25
- an warning if the commit log message given to it does not look
25
+ a warning if the commit log message given to it does not look
26
like a valid UTF-8 string, unless you explicitly say your
27
project uses a legacy encoding. The way to say this is to
28
have i18n.commitencoding in `.git/config` file, like this:
builtin-blame.c
+1
-1
@@ -606,7 +606,7 @@ static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
606
607
/*
608
* src typically is on-stack; we want to copy the information in it to
609
- * an malloced blame_entry that is already on the linked list of the
609
+ * a malloced blame_entry that is already on the linked list of the
610
* scoreboard. The origin of dst loses a refcnt while the origin of src
611
* gains one.
612
*/
ident.c
+1
-1
@@ -152,7 +152,7 @@ static int copy(char *buf, size_t size, int offset, const char *src)
152
/*
153
* Copy the rest to the buffer, but avoid the special
154
* characters '\n' '<' and '>' that act as delimiters on
155
- * a identification line
155
+ * an identification line
156
*/
157
for (i = 0; i < len; i++) {
158
c = *src++;
merge-recursive.c
+1
-1
@@ -289,7 +289,7 @@ static int get_files_dirs(struct tree *tree)
289
}
290
291
/*
292
- * Returns a index_entry instance which doesn't have to correspond to
292
+ * Returns an index_entry instance which doesn't have to correspond to
293
* a real cache entry in Git's index.
294
*/
295
static struct stage_data *insert_stage_data(const char *path,
setup.c
+1
-1
@@ -140,7 +140,7 @@ const char **get_pathspec(const char *prefix, const char **pathspec)
140
* Test if it looks like we're at a git directory.
141
* We want to see:
142
*
143
- * - either a objects/ directory _or_ the proper
143
+ * - either an objects/ directory _or_ the proper
144
* GIT_OBJECT_DIRECTORY environment variable
145
* - a refs/ directory
146
* - either a HEAD symlink or a HEAD file that is formatted as
sha1_file.c
+1
-1
@@ -148,7 +148,7 @@ static void fill_sha1_path(char *pathbuf, const unsigned char *sha1)
148
149
/*
150
* NOTE! This returns a statically allocated buffer, so you have to be
151
- * careful about using it. Do a "xstrdup()" if you need to save the
151
+ * careful about using it. Do an "xstrdup()" if you need to save the
152
* filename.
153
*
154
* Also note that this returns the location for creating. Reading