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>

diff --git a/Documentation/i18n.txt b/Documentation/i18n.txt
index b95f99be6c34ccb7e8583a68d1b1c75a1bf653ca..1e188e6e742d06056fcd8eafd89c13ef36685d4e 100644 (file)
--- 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
 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:
   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 d98caaf2171a9e91c44f47a8519446546b3b02b8..9b4c02e87f7ef4a20d269ab9315b6977cf7fb3fb 100644 (file)
--- 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
 
 /*
  * 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.
  */
  * scoreboard.  The origin of dst loses a refcnt while the origin of src
  * gains one.
  */

diff --git a/ident.c b/ident.c
index 892d77ac9366978fcb172e0d258410f271631012..b839dcf5f085a94080e1f7891f3fb40ed151a394 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -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
        /*
         * 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++;
         */
        for (i = 0; i < len; i++) {
                c = *src++;

diff --git a/merge-recursive.c b/merge-recursive.c
index 33ccc40ecd9aadb7fff05ec22b5e94b1567d878d..b34177d20f1cbbaefd232f070e1f72c677f4eafe 100644 (file)
--- 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,
  * a real cache entry in Git's index.
  */
 static struct stage_data *insert_stage_data(const char *path,

diff --git a/setup.c b/setup.c
index b59dbe7f51e8ffcbf2721d2ec7201400830e6830..adede16a4deea1423f52c3b736de735d27f7172a 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -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:
  *
  * 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
  *    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 b0c24356ae7358561300c9bb3a3f56ba502b2a3b..6583797ce5853bc17ce95bf4cc86af6ee0f660b1 100644 (file)
--- 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
 
 /*
  * 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
  * filename.
  *
  * Also note that this returns the location for creating.  Reading