comments: avoid using the gender of our users

We generally avoid specifying the gender of our users in order to be
more inclusive, but sometimes a few slip by due to habit.

Since by doing a little bit of rewording we can avoid this irrelevant
detail, let's do so.

Inspired-by: Derrick Stolee <dstolee@microsoft.com>
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit.c b/commit.c
index 42f8117b51e2b680d1e323741fe503fc4299682e..d8889601ccbc5918cb8797512c2c8ceeb2a4ccb4 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1164,7 +1164,7 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header
        /*
         * We could verify this signature and either omit the tag when
         * it does not validate, but the integrator may not have the
-        * public key of the signer of the tag he is merging, while a
+        * public key of the signer of the tag being merged, while a
         * later auditor may have it while auditing, so let's not run
         * verify-signed-buffer here for now...
         *

diff --git a/config.h b/config.h
index 19a9adbaa9a3edf41ca2c42a42ff2be58557d744..11d53dc8fca9a12d604a9b2f0d15d1335b4e463d 100644 (file)
--- a/config.h
+++ b/config.h
@@ -448,8 +448,8 @@ void git_configset_init(struct config_set *cs);
 /**
  * Parses the file and adds the variable-value pairs to the `config_set`,
  * dies if there is an error in parsing the file. Returns 0 on success, or
- * -1 if the file does not exist or is inaccessible. The user has to decide
- * if he wants to free the incomplete configset or continue using it when
+ * -1 if the file does not exist or is inaccessible. The caller decides
+ * whether to free the incomplete configset or continue using it when
  * the function returns -1.
  */
 int git_configset_add_file(struct config_set *cs, const char *filename);

diff --git a/date.c b/date.c
index f9ea807b3a9f9ee64a4173fa923f31b00455e840..c55ea47e96ade22462c4b02f1e9954d13ef72837 100644 (file)
--- a/date.c
+++ b/date.c
@@ -908,7 +908,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp)
                /*
                 * We take over "now" here, which usually translates
                 * to the current timestamp.  This is because the user
-                * really means to expire everything she has done in
+                * really means to expire everything that was done in
                 * the past, and by definition reflogs are the record
                 * of the past, and there is nothing from the future
                 * to be kept.

diff --git a/pathspec.h b/pathspec.h
index 454ce364fac7767a78c3d712fb4f82c448f88f33..dfb0b212cdb7375cd19ae93a3f29d0155b6fe98c 100644 (file)
--- a/pathspec.h
+++ b/pathspec.h
@@ -108,7 +108,7 @@ struct pathspec {
  *
  * A similar process is applied when a new pathspec magic is added. The designer
  * lifts the GUARD_PATHSPEC restriction in the functions that support the new
- * magic. At the same time (s)he has to make sure this new feature will be
+ * magic while at the same time making sure this new feature will be
  * caught at parse_pathspec() in commands that cannot handle the new magic in
  * some cases. grepping parse_pathspec() should help.
  */

diff --git a/strbuf.h b/strbuf.h
index 223ee2094af87868b510fb015baa52720d3cf923..a86dcaaf44d15805c3f87aa18a7848a1aba31ec3 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -337,8 +337,8 @@ const char *strbuf_join_argv(struct strbuf *buf, int argc,
  * placeholder is unknown, then the percent sign is copied, too.
  *
  * In order to facilitate caching and to make it possible to give
- * parameters to the callback, `strbuf_expand()` passes a context pointer,
- * which can be used by the programmer of the callback as she sees fit.
+ * parameters to the callback, `strbuf_expand()` passes a context
+ * pointer with any kind of data.
  */
 typedef size_t (*expand_fn_t) (struct strbuf *sb,
                               const char *placeholder,

diff --git a/wt-status.c b/wt-status.c
index 1aed68c43c264c360de8282485c6c93a5dc43d08..805ed35cd33685b54ac7d03d9feb73cf075f9c93 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -638,7 +638,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)
                 * mode by passing a command line option we do not ignore any
                 * changed submodule SHA-1s when comparing index and HEAD, no
                 * matter what is configured. Otherwise the user won't be
-                * shown any submodules she manually added (and which are
+                * shown any submodules manually added (and which are
                 * staged to be committed), which would be really confusing.
                 */
                handle_ignore_submodules_arg(&rev.diffopt, "dirty");