Skip to content

Commit caa7d79

Browse files
gitstergitster
committed
Sync with 'maint'
* maint: Correct common spelling mistakes in comments and tests kwset: fix spelling in comments precompose-utf8: fix spelling of "want" in error message compat/nedmalloc: fix spelling in comments compat/regex: fix spelling and grammar in comments obstack: fix spelling of similar contrib/subtree: fix spelling of accidentally git-remote-mediawiki: spelling fixes doc: various spelling fixes fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format i18n: make the translation of -u advice in one go
2 parents e2af9e3 + a46221e commit caa7d79

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+83
-85
lines changed

‎Documentation/git-credential.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ For example, if we want a password for
5656
`https://example.com/foo.git`, we might generate the following
5757
credential description (don't forget the blank line at the end; it
5858
tells `git credential` that the application finished feeding all the
59-
infomation it has):
59+
information it has):
6060

6161
protocol=https
6262
host=example.com

‎Documentation/git-remote-ext.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ begins with `ext::`. Examples:
8686
edit .ssh/config.
8787

8888
"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo"::
89-
Represents repository with path /somerepo accessable over
89+
Represents repository with path /somerepo accessible over
9090
git protocol at abstract namespace address /git-server.
9191

9292
"ext::git-server-alias foo %G/repo"::

‎Documentation/git-svn.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ first have already been pushed into SVN.
245245
patch), "all" (accept all patches), or "quit".
246246
+
247247
'git svn dcommit' returns immediately if answer if "no" or "quit", without
248-
commiting anything to SVN.
248+
committing anything to SVN.
249249

250250
'branch'::
251251
Create a branch in the SVN repository.
@@ -856,7 +856,7 @@ HANDLING OF SVN BRANCHES
856856
------------------------
857857
If 'git svn' is configured to fetch branches (and --follow-branches
858858
is in effect), it sometimes creates multiple Git branches for one
859-
SVN branch, where the addtional branches have names of the form
859+
SVN branch, where the additional branches have names of the form
860860
'branchname@nnn' (with nnn an SVN revision number). These additional
861861
branches are created if 'git svn' cannot find a parent commit for the
862862
first commit in an SVN branch, to connect the branch to the history of

‎Documentation/git-tools.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Others
109109

110110
- *git.el* (contrib/)
111111

112-
This is an Emacs interface for Git. The user interface is modeled on
112+
This is an Emacs interface for Git. The user interface is modelled on
113113
pcl-cvs. It has been developed on Emacs 21 and will probably need some
114114
tweaking to work on XEmacs.
115115

‎Documentation/revisions.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ when you run `git cherry-pick`.
5555
+
5656
Note that any of the 'refs/*' cases above may come either from
5757
the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.
58-
While the ref name encoding is unspecified, UTF-8 is prefered as
58+
While the ref name encoding is unspecified, UTF-8 is preferred as
5959
some output processing may assume ref names in UTF-8.
6060

6161
'<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}'::

‎Documentation/technical/api-argv-array.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Functions
5555
initial, empty state.
5656

5757
`argv_array_detach`::
58-
Detach the argv array from the `struct argv_array`, transfering
58+
Detach the argv array from the `struct argv_array`, transferring
5959
ownership of the allocated array and strings.
6060

6161
`argv_array_free_detached`::

‎Documentation/technical/api-credentials.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ int foo_login(struct foo_connection *f)
160160
break;
161161
default:
162162
/*
163-
* Some other error occured. We don't know if the
163+
* Some other error occurred. We don't know if the
164164
* credential is good or bad, so report nothing to the
165165
* credential subsystem.
166166
*/

‎Documentation/technical/api-ref-iteration.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Iteration functions
3535
* `head_ref_submodule()`, `for_each_ref_submodule()`,
3636
`for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`,
3737
`for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()`
38-
do the same as the functions descibed above but for a specified
38+
do the same as the functions described above but for a specified
3939
submodule.
4040

4141
* `for_each_rawref()` can be used to learn about broken ref and symref.

‎Documentation/technical/pack-format.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ Git pack format
2626

2727
(deltified representation)
2828
n-byte type and length (3-bit type, (n-1)*7+4-bit length)
29-
20-byte base object name
29+
20-byte base object name if OBJ_REF_DELTA or a negative relative
30+
offset from the delta object's position in the pack if this
31+
is an OBJ_OFS_DELTA object
3032
compressed delta data
3133

3234
Observation: length of each object is encoded in a variable

‎builtin/apply.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,7 +1921,7 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
19211921
}
19221922

19231923
/*
1924-
* Read the patch text in "buffer" taht extends for "size" bytes; stop
1924+
* Read the patch text in "buffer" that extends for "size" bytes; stop
19251925
* reading after seeing a single patch (i.e. changes to a single file).
19261926
* Create fragments (i.e. patch hunks) and hang them to the given patch.
19271927
* Return the number of bytes consumed, so that the caller can call us
@@ -3029,7 +3029,7 @@ static struct patch *in_fn_table(const char *name)
30293029
*
30303030
* The latter is needed to deal with a case where two paths A and B
30313031
* are swapped by first renaming A to B and then renaming B to A;
3032-
* moving A to B should not be prevented due to presense of B as we
3032+
* moving A to B should not be prevented due to presence of B as we
30333033
* will remove it in a later patch.
30343034
*/
30353035
#define PATH_TO_BE_DELETED ((struct patch *) -2)
@@ -3513,7 +3513,7 @@ static int check_patch(struct patch *patch)
35133513
*
35143514
* A patch to swap-rename between A and B would first rename A
35153515
* to B and then rename B to A. While applying the first one,
3516-
* the presense of B should not stop A from getting renamed to
3516+
* the presence of B should not stop A from getting renamed to
35173517
* B; ask to_be_deleted() about the later rename. Removal of
35183518
* B and rename from A to B is handled the same way by asking
35193519
* was_deleted().

0 commit comments

Comments
 (0)