docs: fix typos and grammar
Fix several spelling mistakes, subject-verb agreement issues, and duplicated words. Signed-off-by: Weijie Yuan <wy@wyuan.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>main
parent
a89346e34a
commit
dc6068df67
|
|
@ -1,6 +1,6 @@
|
|||
`--all`::
|
||||
`--no-all`::
|
||||
Fetch all remotes, except for the ones that has the
|
||||
Fetch all remotes, except for the ones that have the
|
||||
`remote.<name>.skipFetchAll` configuration variable set.
|
||||
This overrides the configuration variable `fetch.all`.
|
||||
|
||||
|
|
|
|||
|
|
@ -666,7 +666,7 @@ static int make_hunks(struct sline *sline, unsigned long cnt,
|
|||
* (-) line, which records from what parents the line
|
||||
* was removed; this line does not appear in the result.
|
||||
* then check the set of parents the result has difference
|
||||
* from, from all lines. If there are lines that has
|
||||
* from, from all lines. If there are lines that have
|
||||
* different set of parents that the result has differences
|
||||
* from, that means we have more than two versions.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ test_create_pre2_32_repo () {
|
|||
#
|
||||
# Create a simple subtree on a new branch named ORPHAN in REPO.
|
||||
# The subtree is then merged into the current branch of REPO,
|
||||
# under PREFIX. The generated subtree has has one commit
|
||||
# under PREFIX. The generated subtree has one commit
|
||||
# with subject and tag FILENAME with a single file "FILENAME.t"
|
||||
#
|
||||
# When this method returns:
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ struct hashfd_options {
|
|||
*/
|
||||
struct progress *progress;
|
||||
|
||||
/* The length of the buffer that shall be used read read data. */
|
||||
/* The length of the buffer that shall be used to read data. */
|
||||
size_t buffer_len;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -527,7 +527,7 @@ void free_island_marks(void)
|
|||
kh_destroy_oid_map(island_marks);
|
||||
}
|
||||
|
||||
/* detect use-after-free with a an address which is never valid: */
|
||||
/* detect use-after-free with an address which is never valid: */
|
||||
island_marks = (void *)-1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ static void pickaxe(struct diff_queue_struct *q, struct diff_options *o,
|
|||
for (i = 0; i < q->nr; i++)
|
||||
diff_free_filepair(q->queue[i]);
|
||||
} else {
|
||||
/* Showing only the filepairs that has the needle */
|
||||
/* Showing only the filepairs that have the needle */
|
||||
for (i = 0; i < q->nr; i++) {
|
||||
struct diff_filepair *p = q->queue[i];
|
||||
if (pickaxe_match(p, o, regexp, kws, fn))
|
||||
|
|
|
|||
2
odb.h
2
odb.h
|
|
@ -57,7 +57,7 @@ struct object_database {
|
|||
struct repository *repo;
|
||||
|
||||
/*
|
||||
* State of current current object database transaction. Only one
|
||||
* State of current object database transaction. Only one
|
||||
* transaction may be pending at a time. Is NULL when no transaction is
|
||||
* configured.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1149,7 +1149,7 @@ unknown:
|
|||
(ctx->flags & PARSE_OPT_KEEP_UNKNOWN_OPT)) {
|
||||
/*
|
||||
* Found an unknown option given to a command with
|
||||
* subcommands that has a default operation mode:
|
||||
* subcommands that have a default operation mode:
|
||||
* we treat this option and all remaining args as
|
||||
* arguments meant to that default operation mode.
|
||||
* So we are done parsing.
|
||||
|
|
|
|||
2
rerere.c
2
rerere.c
|
|
@ -548,7 +548,7 @@ static int check_one_conflict(struct index_state *istate, int i, int *type)
|
|||
|
||||
/*
|
||||
* Scan the index and find paths that have conflicts that rerere can
|
||||
* handle, i.e. the ones that has both stages #2 and #3.
|
||||
* handle, i.e. the ones that have both stages #2 and #3.
|
||||
*
|
||||
* NEEDSWORK: we do not record or replay a previous "resolve by
|
||||
* deletion" for a delete-modify conflict, as that is inherently risky
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ test_expect_success 'mailmap.file set' '
|
|||
git shortlog HEAD >actual &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
# The internal_mailmap/.mailmap file is an a subdirectory, but
|
||||
# The internal_mailmap/.mailmap file is in a subdirectory, but
|
||||
# as shown here it can also be outside the repository
|
||||
test_when_finished "rm -rf sub-repo" &&
|
||||
git clone . sub-repo &&
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ test_expect_success POSIXPERM,SYMLINKS "$name" '
|
|||
test_cmp expected.$(test_oid algo) a
|
||||
'
|
||||
|
||||
test_expect_success 'exit if remote refs are ambigious' '
|
||||
test_expect_success 'exit if remote refs are ambiguous' '
|
||||
git config --add svn-remote.svn.fetch \
|
||||
bar:refs/remotes/git-svn &&
|
||||
test_must_fail git svn migrate
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#
|
||||
# The idea is for `test-lib.sh` to source this file when run in GitHub
|
||||
# workflows; these functions will then override (empty) functions
|
||||
# that are are called at the appropriate times during the test runs.
|
||||
# that are called at the appropriate times during the test runs.
|
||||
|
||||
test_skip_test_preamble=t
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
# The idea is for `test-lib.sh` to source this file when the user asks
|
||||
# for JUnit XML; these functions will then override (empty) functions
|
||||
# that are are called at the appropriate times during the test runs.
|
||||
# that are called at the appropriate times during the test runs.
|
||||
|
||||
start_test_output () {
|
||||
junit_xml_dir="$TEST_OUTPUT_DIRECTORY/out"
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ struct traverse_info {
|
|||
|
||||
/**
|
||||
* Walk trees starting with "tree_oid" to find the entry for "name", and
|
||||
* return the the object name and the mode of the found entry via the
|
||||
* return the object name and the mode of the found entry via the
|
||||
* "oid" and "mode" parameters. Return 0 if the entry is found, and -1
|
||||
* otherwise.
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue