mirror of
https://github.com/git/git.git
synced 2024-04-27 15:15:09 +02:00
Merge branch 'ds/gender-neutral-doc'
Update the documentation not to assume users are of certain gender and adds to guidelines to do so. * ds/gender-neutral-doc: *: fix typos comments: avoid using the gender of our users doc: avoid using the gender of other people
This commit is contained in:
commit
8e62a85352
|
@ -373,9 +373,8 @@ If you like, you can put extra tags at the end:
|
||||||
. `Acked-by:` says that the person who is more familiar with the area
|
. `Acked-by:` says that the person who is more familiar with the area
|
||||||
the patch attempts to modify liked the patch.
|
the patch attempts to modify liked the patch.
|
||||||
. `Reviewed-by:`, unlike the other tags, can only be offered by the
|
. `Reviewed-by:`, unlike the other tags, can only be offered by the
|
||||||
reviewer and means that she is completely satisfied that the patch
|
reviewers themselves when they are completely satisfied with the
|
||||||
is ready for application. It is usually offered only after a
|
patch after a detailed analysis.
|
||||||
detailed review.
|
|
||||||
. `Tested-by:` is used to indicate that the person applied the patch
|
. `Tested-by:` is used to indicate that the person applied the patch
|
||||||
and found it to have the desired effect.
|
and found it to have the desired effect.
|
||||||
|
|
||||||
|
|
|
@ -244,8 +244,8 @@ Imagine that you have to rebase what you have already published.
|
||||||
You will have to bypass the "must fast-forward" rule in order to
|
You will have to bypass the "must fast-forward" rule in order to
|
||||||
replace the history you originally published with the rebased history.
|
replace the history you originally published with the rebased history.
|
||||||
If somebody else built on top of your original history while you are
|
If somebody else built on top of your original history while you are
|
||||||
rebasing, the tip of the branch at the remote may advance with her
|
rebasing, the tip of the branch at the remote may advance with their
|
||||||
commit, and blindly pushing with `--force` will lose her work.
|
commit, and blindly pushing with `--force` will lose their work.
|
||||||
+
|
+
|
||||||
This option allows you to say that you expect the history you are
|
This option allows you to say that you expect the history you are
|
||||||
updating is what you rebased and want to replace. If the remote ref
|
updating is what you rebased and want to replace. If the remote ref
|
||||||
|
|
|
@ -2792,7 +2792,7 @@ A fast-forward looks something like this:
|
||||||
|
|
||||||
In some cases it is possible that the new head will *not* actually be
|
In some cases it is possible that the new head will *not* actually be
|
||||||
a descendant of the old head. For example, the developer may have
|
a descendant of the old head. For example, the developer may have
|
||||||
realized she made a serious mistake, and decided to backtrack,
|
realized a serious mistake was made and decided to backtrack,
|
||||||
resulting in a situation like:
|
resulting in a situation like:
|
||||||
|
|
||||||
................................................
|
................................................
|
||||||
|
|
2
commit.c
2
commit.c
|
@ -1178,7 +1178,7 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header
|
||||||
/*
|
/*
|
||||||
* We could verify this signature and either omit the tag when
|
* We could verify this signature and either omit the tag when
|
||||||
* it does not validate, but the integrator may not have the
|
* 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
|
* later auditor may have it while auditing, so let's not run
|
||||||
* verify-signed-buffer here for now...
|
* verify-signed-buffer here for now...
|
||||||
*
|
*
|
||||||
|
|
2
config.c
2
config.c
|
@ -2838,7 +2838,7 @@ static void maybe_remove_section(struct config_store_data *store,
|
||||||
begin = store->parsed[i].begin;
|
begin = store->parsed[i].begin;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Next, make sure that we are removing he last key(s) in the section,
|
* Next, make sure that we are removing the last key(s) in the section,
|
||||||
* and that there are no comments that are possibly about the current
|
* and that there are no comments that are possibly about the current
|
||||||
* section.
|
* section.
|
||||||
*/
|
*/
|
||||||
|
|
4
config.h
4
config.h
|
@ -450,8 +450,8 @@ void git_configset_init(struct config_set *cs);
|
||||||
/**
|
/**
|
||||||
* Parses the file and adds the variable-value pairs to the `config_set`,
|
* 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
|
* 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
|
* -1 if the file does not exist or is inaccessible. The caller decides
|
||||||
* if he wants to free the incomplete configset or continue using it when
|
* whether to free the incomplete configset or continue using it when
|
||||||
* the function returns -1.
|
* the function returns -1.
|
||||||
*/
|
*/
|
||||||
int git_configset_add_file(struct config_set *cs, const char *filename);
|
int git_configset_add_file(struct config_set *cs, const char *filename);
|
||||||
|
|
2
date.c
2
date.c
|
@ -908,7 +908,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp)
|
||||||
/*
|
/*
|
||||||
* We take over "now" here, which usually translates
|
* We take over "now" here, which usually translates
|
||||||
* to the current timestamp. This is because the user
|
* 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
|
* the past, and by definition reflogs are the record
|
||||||
* of the past, and there is nothing from the future
|
* of the past, and there is nothing from the future
|
||||||
* to be kept.
|
* to be kept.
|
||||||
|
|
|
@ -108,7 +108,7 @@ struct pathspec {
|
||||||
*
|
*
|
||||||
* A similar process is applied when a new pathspec magic is added. The designer
|
* 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
|
* 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
|
* caught at parse_pathspec() in commands that cannot handle the new magic in
|
||||||
* some cases. grepping parse_pathspec() should help.
|
* some cases. grepping parse_pathspec() should help.
|
||||||
*/
|
*/
|
||||||
|
|
4
strbuf.h
4
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.
|
* placeholder is unknown, then the percent sign is copied, too.
|
||||||
*
|
*
|
||||||
* In order to facilitate caching and to make it possible to give
|
* In order to facilitate caching and to make it possible to give
|
||||||
* parameters to the callback, `strbuf_expand()` passes a context pointer,
|
* parameters to the callback, `strbuf_expand()` passes a context
|
||||||
* which can be used by the programmer of the callback as she sees fit.
|
* pointer with any kind of data.
|
||||||
*/
|
*/
|
||||||
typedef size_t (*expand_fn_t) (struct strbuf *sb,
|
typedef size_t (*expand_fn_t) (struct strbuf *sb,
|
||||||
const char *placeholder,
|
const char *placeholder,
|
||||||
|
|
|
@ -1538,7 +1538,6 @@ test_expect_success 'O: comments are all skipped' '
|
||||||
commit refs/heads/O1
|
commit refs/heads/O1
|
||||||
# -- ignore all of this text
|
# -- ignore all of this text
|
||||||
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
||||||
# $GIT_COMMITTER_NAME has inserted here for his benefit.
|
|
||||||
data <<COMMIT
|
data <<COMMIT
|
||||||
dirty directory copy
|
dirty directory copy
|
||||||
COMMIT
|
COMMIT
|
||||||
|
|
|
@ -639,7 +639,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)
|
||||||
* mode by passing a command line option we do not ignore any
|
* mode by passing a command line option we do not ignore any
|
||||||
* changed submodule SHA-1s when comparing index and HEAD, no
|
* changed submodule SHA-1s when comparing index and HEAD, no
|
||||||
* matter what is configured. Otherwise the user won't be
|
* 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.
|
* staged to be committed), which would be really confusing.
|
||||||
*/
|
*/
|
||||||
handle_ignore_submodules_arg(&rev.diffopt, "dirty");
|
handle_ignore_submodules_arg(&rev.diffopt, "dirty");
|
||||||
|
|
Loading…
Reference in New Issue