Skip to content

Commit 0e20b22

Browse files
felipecgitster
authored andcommitted
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 <[email protected]> Helped-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 69b3367 commit 0e20b22

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

commit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header
11641164
/*
11651165
* We could verify this signature and either omit the tag when
11661166
* 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
11681168
* later auditor may have it while auditing, so let's not run
11691169
* verify-signed-buffer here for now...
11701170
*

config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,8 @@ void git_configset_init(struct config_set *cs);
448448
/**
449449
* Parses the file and adds the variable-value pairs to the `config_set`,
450450
* 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
453453
* the function returns -1.
454454
*/
455455
int git_configset_add_file(struct config_set *cs, const char *filename);

date.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp)
908908
/*
909909
* We take over "now" here, which usually translates
910910
* 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
912912
* the past, and by definition reflogs are the record
913913
* of the past, and there is nothing from the future
914914
* to be kept.

pathspec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ struct pathspec {
108108
*
109109
* A similar process is applied when a new pathspec magic is added. The designer
110110
* 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
112112
* caught at parse_pathspec() in commands that cannot handle the new magic in
113113
* some cases. grepping parse_pathspec() should help.
114114
*/

strbuf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ const char *strbuf_join_argv(struct strbuf *buf, int argc,
337337
* placeholder is unknown, then the percent sign is copied, too.
338338
*
339339
* 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.
342342
*/
343343
typedef size_t (*expand_fn_t) (struct strbuf *sb,
344344
const char *placeholder,

wt-status.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)
638638
* mode by passing a command line option we do not ignore any
639639
* changed submodule SHA-1s when comparing index and HEAD, no
640640
* 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
642642
* staged to be committed), which would be really confusing.
643643
*/
644644
handle_ignore_submodules_arg(&rev.diffopt, "dirty");

0 commit comments

Comments
 (0)