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>
Felipe Contreras committed
Jun 15, 2021 at 14:11 UTC
0e20b229eea63716cdd1bea916b7e416f450278a
6 files changed
+8
-8
commit.c
+1
-1
@@ -1164,7 +1164,7 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header
1164
/*
1165
* We could verify this signature and either omit the tag when
1166
* it does not validate, but the integrator may not have the
1167
- * public key of the signer of the tag he is merging, while a
1167
+ * public key of the signer of the tag being merged, while a
1168
* later auditor may have it while auditing, so let's not run
1169
* verify-signed-buffer here for now...
1170
*
config.h
+2
-2
@@ -448,8 +448,8 @@ void git_configset_init(struct config_set *cs);
448
/**
449
* Parses the file and adds the variable-value pairs to the `config_set`,
450
* dies if there is an error in parsing the file. Returns 0 on success, or
451
- * -1 if the file does not exist or is inaccessible. The user has to decide
452
- * if he wants to free the incomplete configset or continue using it when
451
+ * -1 if the file does not exist or is inaccessible. The caller decides
452
+ * whether to free the incomplete configset or continue using it when
453
* the function returns -1.
454
*/
455
int git_configset_add_file(struct config_set *cs, const char *filename);
date.c
+1
-1
@@ -908,7 +908,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp)
908
/*
909
* We take over "now" here, which usually translates
910
* to the current timestamp. This is because the user
911
- * really means to expire everything she has done in
911
+ * really means to expire everything that was done in
912
* the past, and by definition reflogs are the record
913
* of the past, and there is nothing from the future
914
* to be kept.
pathspec.h
+1
-1
@@ -108,7 +108,7 @@ struct pathspec {
108
*
109
* A similar process is applied when a new pathspec magic is added. The designer
110
* lifts the GUARD_PATHSPEC restriction in the functions that support the new
111
- * magic. At the same time (s)he has to make sure this new feature will be
111
+ * magic while at the same time making sure this new feature will be
112
* caught at parse_pathspec() in commands that cannot handle the new magic in
113
* some cases. grepping parse_pathspec() should help.
114
*/
strbuf.h
+2
-2
@@ -337,8 +337,8 @@ const char *strbuf_join_argv(struct strbuf *buf, int argc,
337
* placeholder is unknown, then the percent sign is copied, too.
338
*
339
* In order to facilitate caching and to make it possible to give
340
- * parameters to the callback, `strbuf_expand()` passes a context pointer,
341
- * which can be used by the programmer of the callback as she sees fit.
340
+ * parameters to the callback, `strbuf_expand()` passes a context
341
+ * pointer with any kind of data.
342
*/
343
typedef size_t (*expand_fn_t) (struct strbuf *sb,
344
const char *placeholder,
wt-status.c
+1
-1
@@ -638,7 +638,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)
638
* mode by passing a command line option we do not ignore any
639
* changed submodule SHA-1s when comparing index and HEAD, no
640
* matter what is configured. Otherwise the user won't be
641
- * shown any submodules she manually added (and which are
641
+ * shown any submodules manually added (and which are
642
* staged to be committed), which would be really confusing.
643
*/
644
handle_ignore_submodules_arg(&rev.diffopt, "dirty");