Skip to content

Commit 98e023d

Browse files
neleaigitster
authored andcommitted
many small typofixes
Signed-off-by: Ondřej Bílka <[email protected]> Reviewed-by: Marc Branchaud <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 749f763 commit 98e023d

20 files changed

+23
-23
lines changed

Documentation/howto/new-command.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ your language, document it in the INSTALL file.
9494
6. There is a file command-list.txt in the distribution main directory
9595
that categorizes commands by type, so they can be listed in appropriate
9696
subsections in the documentation's summary command list. Add an entry
97-
for yours. To understand the categories, look at git-cmmands.txt
97+
for yours. To understand the categories, look at git-commands.txt
9898
in the main directory.
9999

100100
7. Give the maintainer one paragraph to include in the RelNotes file

Documentation/technical/api-revision-walking.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function.
5959
`reset_revision_walk`::
6060

6161
Reset the flags used by the revision walking api. You can use
62-
this to do multiple sequencial revision walks.
62+
this to do multiple sequential revision walks.
6363

6464
Data structures
6565
---------------

builtin/fast-export.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ static void handle_tag(const char *name, struct tag *tag)
379379
int tagged_mark;
380380
struct commit *p;
381381

382-
/* Trees have no identifer in fast-export output, thus we have no way
382+
/* Trees have no identifier in fast-export output, thus we have no way
383383
* to output tags of trees, tags of tags of trees, etc. Simply omit
384384
* such tags.
385385
*/

builtin/push.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static NORETURN int die_push_simple(struct branch *branch, struct remote *remote
9292
if (!short_upstream)
9393
short_upstream = branch->merge[0]->src;
9494
/*
95-
* Don't show advice for people who explicitely set
95+
* Don't show advice for people who explicitly set
9696
* push.default.
9797
*/
9898
if (push_default == PUSH_DEFAULT_UNSPECIFIED)

cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ extern void *read_blob_data_from_index(struct index_state *, const char *, unsig
491491
extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
492492
extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
493493

494-
#define PATHSPEC_ONESTAR 1 /* the pathspec pattern sastisfies GFNM_ONESTAR */
494+
#define PATHSPEC_ONESTAR 1 /* the pathspec pattern satisfies GFNM_ONESTAR */
495495

496496
struct pathspec {
497497
const char **raw; /* get_pathspec() result, not freed by free_pathspec() */

combine-diff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
165165

166166
/*
167167
* Coalesce new lines into base by finding the LCS
168-
* - Create the table to run dynamic programing
168+
* - Create the table to run dynamic programming
169169
* - Compute the LCS
170170
* - Then reverse read the direction structure:
171171
* - If we have MATCH, assign parent to base flag, and consume

contrib/ciabot/ciabot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
# The template used to generate the XML messages to CIA. You can make
7272
# visible changes to the IRC-bot notification lines by hacking this.
73-
# The default will produce a notfication line that looks like this:
73+
# The default will produce a notification line that looks like this:
7474
#
7575
# ${project}: ${author} ${repo}:${branch} * ${rev} ${files}: ${logmsg} ${url}
7676
#

contrib/ciabot/ciabot.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# done
4040
#
4141
# The reason for the tac call is that git rev-list emits commits from
42-
# most recent to least - better to ship notifactions from oldest to newest.
42+
# most recent to least - better to ship notifications from oldest to newest.
4343
#
4444
# Configuration variables affecting this script:
4545
#
@@ -64,7 +64,7 @@
6464
# down. It is unknown whether this is still an issue in 2010, but
6565
# XML-RPC would be annoying to do from sh in any case. (XML-RPC does
6666
# have the advantage that it guarantees notification of multiple commits
67-
# shpped from an update in their actual order.)
67+
# shipped from an update in their actual order.)
6868
#
6969

7070
# The project as known to CIA. You can set this with a -p option,

contrib/subtree/git-subtree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ git-extensions repository in ~/git-extensions/:
270270
name
271271

272272
You can omit the --squash flag, but doing so will increase the number
273-
of commits that are incldued in your local repository.
273+
of commits that are included in your local repository.
274274

275275
We now have a ~/git-extensions/git-subtree directory containing code
276276
from the master branch of git://github.com/apenwarr/git-subtree.git

git-mergetool--lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ setup_user_tool () {
144144
setup_tool () {
145145
tool="$1"
146146

147-
# Fallback definitions, to be overriden by tools.
147+
# Fallback definitions, to be overridden by tools.
148148
can_merge () {
149149
return 0
150150
}

0 commit comments

Comments
 (0)